Merge branch 'next/boards' into HEAD

Conflicts:
	arch/arm/mach-shmobile/board-armadillo800eva.c

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

diff --cc arch/arm/configs/armadillo800eva_defconfig
Simple merge

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

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

diff --cc arch/arm/mach-ks8695/Makefile
Simple merge

diff --cc arch/arm/mach-msm/Kconfig
index b2740c800e8cb934869f88142bbcb3ccf343a9e1,03c549369ce3fee4249f1736e58ea65d208797af..7902de151cc5bedf339b2f5d75e694f5ad70cd78
--- 1/arch/arm/mach-msm/Kconfig
--- 2/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@@ -36,8 -40,12 +40,10 @@@ config ARCH_QSD8X5
        select GPIO_MSM_V1
        select MSM_PROC_COMM
  
+ endchoice
+ 
  config ARCH_MSM8X60
        bool "MSM8X60"
 -      select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
 -                                && !MACH_MSM8X60_FFA)
        select ARCH_MSM_SCORPIONMP
        select ARM_GIC
        select CPU_V7
@@@ -55,10 -63,7 +61,8 @@@ config ARCH_MSM896
        select MSM_V2_TLMM
        select MSM_GPIOMUX
        select MSM_SCM if SMP
 +      select USE_OF
  
- endchoice
- 
  config MSM_HAS_DEBUG_UART_HS
        bool
  

diff --cc arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
Simple merge

diff --cc arch/arm/mach-msm/io.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
index 45b33e02dff55c17aece60c0c3bb5b5adf196397,81dfb88ce813048b2211d20e1194d4f213ba7eb7..9615a78d30b2c2aaceec2b5ac97ac5f2fbc49aa2
--- 1/arch/arm/mach-shmobile/board-armadillo800eva.c
--- 2/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@@ -902,8 -924,9 +925,9 @@@ static struct platform_device *eva_devi
        &camera_device,
        &ceu0_device,
        &fsi_device,
 -      &fsi_hdmi_device,
        &fsi_wm8978_device,
 +      &fsi_hdmi_device,
+       &i2c_gpio_device,
  };
  
  static void __init eva_clock_init(void)

diff --cc arch/arm/mach-shmobile/board-marzen.c
Simple merge