projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ce5445 430cb43)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 6 Jan 2008 22:35:19 +0000 (14:35 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 6 Jan 2008 22:35:19 +0000 (14:35 -0800)
* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4691/1: add missing i2c_board_info struct for at91rm9200
  [ARM] 4735/1: Unbreak pxa25x suspend/resume


Trivial merge
John Crispins staging tree