Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features
authorSascha Hauer <s.hauer@pengutronix.de>
Thu, 7 Jul 2011 08:00:49 +0000 (10:00 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Thu, 7 Jul 2011 08:00:49 +0000 (10:00 +0200)
commite59a7943f2f72a1dc218447f4f285c8b67b3a98e
tree278b164568087fd6c92bb31572238ecf9ab4674f
parentfad107086d5a869c1c07e5bb35b7b57a10ecf578
parent2ce420da39078a6135d1c004a0e4436fdc1458b4
Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features

Conflicts:
arch/arm/mach-imx/mach-mx31_3ds.c
arch/arm/mach-imx/mach-scb9328.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
13 files changed:
arch/arm/mach-imx/mach-apf9328.c
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mach-mx31_3ds.c
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-imx/mach-mx35_3ds.c
arch/arm/mach-imx/mach-scb9328.c
arch/arm/mach-mx5/board-cpuimx51.c
arch/arm/mach-mx5/board-mx51_3ds.c
arch/arm/mach-mx5/board-mx51_babbage.c
arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/board-mx51_efikasb.c
drivers/gpio/Kconfig