linux/arch/arm/mach-pxa/include
Arnd Bergmann 43872fa788 Merge branch 'depends/rmk/gpio' into next/fixes
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>
2011-10-31 22:44:18 +01:00
..
mach Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00