Merge branches 'cleanup', 'dt', 'soc', 'boards', 'defconfig', 'armadillo800eva-fixes...

diff --cc arch/arm/configs/marzen_defconfig
index 864f9a5c39dd218c00ed6757702f522e1e8504ee,864f9a5c39dd218c00ed6757702f522e1e8504ee,864f9a5c39dd218c00ed6757702f522e1e8504ee,f513acedc10a57ee67099773019e2c4c54ab252e,737e49890db57b2824bc1857895e4bdc9c68b02f,864f9a5c39dd218c00ed6757702f522e1e8504ee,864f9a5c39dd218c00ed6757702f522e1e8504ee..53382b6c8bb43345ae75b8f1ea39ab509d161980
--- 1/arch/arm/configs/marzen_defconfig
--- 2/arch/arm/configs/marzen_defconfig
--- 3/arch/arm/configs/marzen_defconfig
--- 4/arch/arm/configs/marzen_defconfig
--- 5/arch/arm/configs/marzen_defconfig
--- 6/arch/arm/configs/marzen_defconfig
--- 7/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@@@@@@@ -68,9 -68,9 -68,9 -68,11 -71,10 -68,9 -68,9 +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
Simple merge

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