From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 7 Aug 2007 01:31:43 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.23-rc3~91
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4a2a4df7b6db25df8f3d5cc6dd0b096119359d92;p=~emulex%2Finfiniband.git

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
---

4a2a4df7b6db25df8f3d5cc6dd0b096119359d92