From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 20 Sep 2011 08:09:08 +0000 (+0200)
Subject: Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup
X-Git-Tag: v3.2-rc1~98^2~7^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6da5ce1728e3058312b6cf36786189002de1407d;p=linux.git

Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup

Conflicts:
	arch/arm/mach-mx5/Makefile

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

6da5ce1728e3058312b6cf36786189002de1407d
diff --cc arch/arm/mach-mx5/Makefile
index 7f452433a690,383e7cd3fbcb,60f756db8d76..9565304b7282
--- a/arch/arm/mach-mx5/Makefile
+++ b/arch/arm/mach-mx5/Makefile
@@@@ -3,8 -3,8 -3,7 +3,7 @@@@
   #
   
   # Object file lists.
 --obj-y   := cpu.o mm.o clock-mx51-mx53.o devices.o ehci.o system.o
 - obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
 ++obj-y   := cpu.o mm.o clock-mx51-mx53.o ehci.o system.o
-  obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
   
   obj-$(CONFIG_PM) += pm-imx5.o
   obj-$(CONFIG_CPU_FREQ_IMX)    += cpu_op-mx51.o