Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit4a2a4df7b6db25df8f3d5cc6dd0b096119359d92
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 7 Aug 2007 01:31:43 +0000 (6 18:31 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 7 Aug 2007 01:31:43 +0000 (6 18:31 -0700)
tree87a5985965c75a9184ad4bbec393ad2d66c54948
parentf27eb3afe87bd4b3fe919a6b7bf364f577ccee3b
parent6e7d934060559454f161b3cf7cc5b7a5926e71d6
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* 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