Skip to content
Commit d7bd1b8a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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()
parents a4611783 b5d798cc
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment