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>