Sascha Hauer ba361ee78f Merge branch 'pu/mx6-v2' into next ... Conflicts: arch/arm/Makefile arch/arm/mach-imx/Kconfig Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>		2012-04-24 10:38:23 +02:00
..
mach	Merge branch 'pu/mx6-v2' into next	2012-04-24 10:38:23 +02:00