Merge branches 'heads/cleanup', 'heads/dt', 'heads/soc', 'heads/defconfig', 'heads...

diff --cc arch/arm/Kconfig
Simple merge

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

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

diff --cc arch/arm/plat-samsung/devs.c
index 74e31ce355388bd7c2062b35fb30e09ca085b3f5,74e31ce355388bd7c2062b35fb30e09ca085b3f5,74e31ce355388bd7c2062b35fb30e09ca085b3f5,fc49f3dabd7653624b7f9ccc8e78ef12b102d527,74e31ce355388bd7c2062b35fb30e09ca085b3f5,8154fab70de8404a5ea89f71b8f6f20e0056c9ff,fc49f3dabd7653624b7f9ccc8e78ef12b102d527..6ff45d53362c1a0ef61d0806626829223f96e78e
--- 1/arch/arm/plat-samsung/devs.c
--- 2/arch/arm/plat-samsung/devs.c
--- 3/arch/arm/plat-samsung/devs.c
--- 4/arch/arm/plat-samsung/devs.c
--- 5/arch/arm/plat-samsung/devs.c
--- 6/arch/arm/plat-samsung/devs.c
--- 7/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@@@@@@@ -32,8 -32,8 -32,8 -32,10 -32,8 -32,7 -32,10 +32,9 @@@@@@@@
       #include <linux/platform_data/s3c-hsudc.h>
       #include <linux/platform_data/s3c-hsotg.h>
       
+++ ++ #include <media/s5p_hdmi.h>
+++ ++ 
       #include <asm/irq.h>
----- -#include <asm/pmu.h>
       #include <asm/mach/arch.h>
       #include <asm/mach/map.h>
       #include <asm/mach/irq.h>

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/gpio-em.c
Simple merge