Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h
Signed-off-by: NArnd Bergmann <arnd@arndb.de>