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)
commitd7bd1b8a6104bcdc53611689fec8715a236a22c8
treeab13f2a62b39099f7c366cdcf1980ea9ee1348e1
parenta46117836e23f97cf4660b0ebf8404ad151fb63d
parentb5d798cc7a221aec50baf496c482280f1b809143
Merge branch 'drivers/pxa-gpio' into next/drivers

* drivers/pxa-gpio:
  Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
  pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()