43872fa788
This sorts out merge conflicts with the arm/gpio branch that already got merged into mainline Linux. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
dma.h | ||
gpio-pxa.h | ||
gpio.h | ||
mfp.h | ||
pxa3xx_nand.h | ||
pxa27x_keypad.h |