Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards' and 'heads/soc' into...

Conflicts:
	arch/arm/configs/marzen_defconfig

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

diff --cc arch/arm/configs/kzm9g_defconfig
index c88b57886e791906f8f21459df939718a95be0b6,b377a6f2c1c16715e6d5582397e12ff1c6c5fdff,ce99e3e00efa1c13e9a6b3f2d9282f94d046c36c,c88b57886e791906f8f21459df939718a95be0b6..afbae287436bfb1f4a9fd1b18da52b50f6a22394
--- 1/arch/arm/configs/kzm9g_defconfig
--- 2/arch/arm/configs/kzm9g_defconfig
--- 3/arch/arm/configs/kzm9g_defconfig
--- 4/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@@@@ -119,8 -119,7 -121,10 -119,8 +121,9 @@@@@ CONFIG_DMADEVICES=
    CONFIG_SH_DMAE=y
    CONFIG_ASYNC_TX_DMA=y
    CONFIG_STAGING=y
++ +CONFIG_SENSORS_AK8975=y
++ +CONFIG_IIO=y
    # CONFIG_DNOTIFY is not set
- --CONFIG_INOTIFY_USER=y
    CONFIG_VFAT_FS=y
    CONFIG_TMPFS=y
    # CONFIG_MISC_FILESYSTEMS is not set

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

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

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

diff --cc arch/arm/mach-shmobile/clock-r8a7779.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7779.c
Simple merge