Merge branch 'next/soc' into for-linus

Conflicts:
	arch/arm/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index bcc0670063428cf16e22b580f8dd5905acf39891,f41fe7a40019b4f59b4d80aac85fa0e867cb4129..fe6b0526b3a6fb3f52d35730b84930932050d8a9
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1398,8 -1435,7 +1430,8 @@@ config SM
        depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
                 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
                 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
-                ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE
+                ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q
 +      depends on MMU
        select USE_GENERIC_SMP_HELPERS
        select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
        help

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mach-imx/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/Makefile.boot
index dbe61201bcd80202007d604ca5bb8c98cba0aadc,136cfc6f2f85e66d7e10537d1fc2438f458d4d53..22d85889f622917ece0fe5310751bf4ab488fed3
--- 1/arch/arm/mach-imx/Makefile.boot
--- 2/arch/arm/mach-imx/Makefile.boot
+++ b/arch/arm/mach-imx/Makefile.boot
@@@ -14,6 -14,10 +14,10 @@@ zreladdr-$(CONFIG_MACH_MX27)        += 0xA0008
  params_phys-$(CONFIG_MACH_MX27)       := 0xA0000100
  initrd_phys-$(CONFIG_MACH_MX27)       := 0xA0800000
  
 -zreladdr-$(CONFIG_ARCH_MX3)   := 0x80008000
 +zreladdr-$(CONFIG_ARCH_MX3)   += 0x80008000
  params_phys-$(CONFIG_ARCH_MX3)        := 0x80000100
  initrd_phys-$(CONFIG_ARCH_MX3)        := 0x80800000
+ 
+ zreladdr-$(CONFIG_SOC_IMX6Q)  += 0x10008000
+ params_phys-$(CONFIG_SOC_IMX6Q)       := 0x10000100
+ initrd_phys-$(CONFIG_SOC_IMX6Q)       := 0x10800000

diff --cc arch/arm/plat-mxc/Kconfig
Simple merge