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


Trivial merge