linux-next: manual merge of the i.MX tree with the arm-soc tree

[Stephen Rothwell]

Hi Sascha,

Today's linux-next merge of the i.MX tree got a conflict in
arch/arm/mach-imx/Makefile between commit 91dc67d94810 ("Merge branch
'next/devel' of
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
into for-next") from the arm-soc tree and commit ea754946551b ("Merge
branch 'imx-features' and 'imx-cleanup' into master") from the i.MX tree.

The conflict looks like this:

diff --cc arch/arm/mach-imx/Makefile
index f87cc55,d22096a..0000000
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@@ -3,7 -3,7 +3,11 @@@ obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1
  obj-$(CONFIG_SOC_IMX1) += clock-imx1.o mm-imx1.o
  obj-$(CONFIG_SOC_IMX21) += clock-imx21.o mm-imx21.o
  
++<<<<<<< HEAD
 +obj-$(CONFIG_SOC_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o
++=======
+ obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o
++>>>>>>> i.MX/for-next
  
  obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
  obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o

Given that there are no other references to SOC_MX25 in the resulting
tree, I used the latter version.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature