Sascha Hauer e59a7943f2 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>

2011-07-07 10:00:49 +02:00

..

mach

Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features

2011-07-07 10:00:49 +02:00