Merge branch 'drivers/pxa-gpio' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Dec 2011 10:27:16 +0000 (10:27 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 28 Dec 2011 10:27:16 +0000 (10:27 +0000)
* drivers/pxa-gpio:
  Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
  pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()


Trivial merge