Done to resolve merge conflict:

Conflicts:
	arch/arm/mach-mx25/devices-imx25.h
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>