Merge branch 'heads/boards' into next

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

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

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

diff --cc arch/arm/configs/marzen_defconfig
index 737e49890db57b2824bc1857895e4bdc9c68b02f,f513acedc10a57ee67099773019e2c4c54ab252e..53382b6c8bb43345ae75b8f1ea39ab509d161980
--- 1/arch/arm/configs/marzen_defconfig
--- 2/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@@ -71,10 -68,11 +71,12 @@@ CONFIG_SERIAL_SH_SCI_CONSOLE=
  # CONFIG_HW_RANDOM is not set
  CONFIG_GPIO_SYSFS=y
  # CONFIG_HWMON is not set
+ CONFIG_THERMAL=y
+ CONFIG_RCAR_THERMAL=y
  CONFIG_SSB=y
 -# CONFIG_HID_SUPPORT is not set
  # CONFIG_USB_SUPPORT is not set
 +CONFIG_MMC=y
 +CONFIG_MMC_SDHI=y
  CONFIG_UIO=y
  CONFIG_UIO_PDRV_GENIRQ=y
  # CONFIG_IOMMU_SUPPORT is not set

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
index 453a6e50db8be95f5fdb8574672fa00aa1671ecb,81dfb88ce813048b2211d20e1194d4f213ba7eb7..cd79119d8229091adc5082fbbbe06e93711c7d09
--- 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-kzm9g.c
Simple merge

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