Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc

* 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits)
  MAINTAINERS: add ARM/FREESCALE IMX6 entry
  arm/imx: merge i.MX3 and i.MX6
  arm/imx6q: add suspend/resume support
  arm/imx6q: add device tree machine support
  arm/imx6q: add smp and cpu hotplug support
  arm/imx6q: add core drivers clock, gpc, mmdc and src
  arm/imx: add gic_handle_irq function
  arm/imx6q: add core definitions and low-level debug uart
  arm/imx6q: add device tree source
  ARM: highbank: add suspend support
  ARM: highbank: Add cpu hotplug support
  ARM: highbank: add SMP support
  MAINTAINERS: add Calxeda Highbank ARM platform
  ARM: add Highbank core platform support
  ARM: highbank: add devicetree source
  ARM: l2x0: add empty l2x0_of_init
  picoxcell: add a definition of VMALLOC_END
  picoxcell: remove custom ioremap implementation
  picoxcell: add the DTS for the PC7302 board
  picoxcell: add the DTS for pc3x2 and pc3x3 devices
  ...

Fix up trivial conflicts in arch/arm/Kconfig, and some more header file
conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge
by Arnd).

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index bcc0670,f41fe7a..fe6b052
--- 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 dbe6120,136cfc6..22d8588
--- 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/mach-omap2/board-generic.c
index 0c42797,67f0a12..0cc9094
--- 1/arch/arm/mach-omap2/board-generic.c
--- 2/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -11,7 -11,10 +11,6 @@@
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.
   */
- 
 -#include <linux/gpio.h>
 -#include <linux/kernel.h>
 -#include <linux/init.h>
 -#include <linux/device.h>
  #include <linux/io.h>
  #include <linux/of_platform.h>
  #include <linux/irqdomain.h>

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