Arnd Bergmann efa62e1355 Merge branch 'depends/rmk/gpio' into next/devel ...

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2011-10-31 23:46:42 +01:00

12 KiB

Raw Blame History

View Raw