]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 7 Aug 2007 01:31:43 +0000 (18:31 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 7 Aug 2007 01:31:43 +0000 (18:31 -0700)
* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] rpc: update defconfig
  [ARM] pata_icside: fix the FIXMEs
  [ARM] 4542/1: AT91: include atmel_lcdc.h in at91sam926{1,3}_devices.c
  [ARM] 4541/1: iop: defconfig updates
  [ARM] 4531/1: remove is_in_rom() protptype


Trivial merge