From: Uwe Kleine-König Date: Thu, 25 Feb 2010 13:01:49 +0000 (+0100) Subject: Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx... X-Git-Tag: v2.6.34-rc2~66^2~5^2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b1489e989695c4d502865f8bec616c0f17e99ab;p=pandora-kernel.git 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 03e09cd8902717b66f940357257d8ad76114d9f2. arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520538e095d10456acd28d9107317aa32 and got bug fixed in 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c. The bug in arch/arm/plat-mxc/iomux-v1.c isn't present any more since bac3fcfad565c9bbceeed8b607f140c29df97355, 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 --- 9b1489e989695c4d502865f8bec616c0f17e99ab Reading git-diff-tree failed