Uwe Kleine-König 9b1489e989 Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master ... Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5. This is handled in 03e09cd890. arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520 and got bug fixed in 5c17ef878f. The bug in arch/arm/plat-mxc/iomux-v1.c isn't present any more since bac3fcfad5, so arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted. Conflicts: arch/arm/plat-mxc/Kconfig arch/arm/plat-mxc/Makefile arch/arm/plat-mxc/iomux-mx1-mx2.c Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		2010-02-25 14:01:49 +01:00
..
mach	Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master	2010-02-25 14:01:49 +01:00