| commit | d7bd1b8a6104bcdc53611689fec8715a236a22c8 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Dec 28 10:27:16 2011 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Dec 28 10:27:16 2011 +0000 |
| tree | ab13f2a62b39099f7c366cdcf1980ea9ee1348e1 | |
| parent | a46117836e23f97cf4660b0ebf8404ad151fb63d [diff] | |
| parent | b5d798cc7a221aec50baf496c482280f1b809143 [diff] |
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()