Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 3 Aug 2006 03:21:23 +0000 (20:21 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 3 Aug 2006 03:21:23 +0000 (20:21 -0700)
commit1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c
treeecfe847dda816361d83b1da6d7213b27721e7fd7
parenta166222cde740b34d97fe49dca70348197f4534e
parente252630f1fd1d14ac4081e566d2f697ae1779215
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3743/1: ARM: OMAP: Fix compile for OMAP
  [ARM] 3739/1: genirq updates:  irq_chip, add and use irq_chip.name