Merge remote-tracking branch 'samsung/for-next'

Conflicts:
	arch/arm/mach-exynos/mach-exynos4-dt.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index 1a777ddb7348bc2c76f9c5a69d3a003ef46cbed6,4a2e76fc1f606299c0f449363bbfe013c005b029..d68898ac36f397d3731369eff8562d9394e944ec
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -725,9 -728,10 +725,9 @@@ config ARCH_S3C64X
        select CLKDEV_LOOKUP
        select CLKSRC_SAMSUNG_PWM
        select COMMON_CLK
-       select CPU_V6
+       select CPU_V6K
        select GENERIC_CLOCKEVENTS
        select GPIO_SAMSUNG
 -      select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select HAVE_TCM

diff --cc arch/arm/boot/dts/exynos5250.dtsi
Simple merge

diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
Simple merge

diff --cc arch/arm/plat-samsung/devs.c
Simple merge

diff --cc drivers/dma/Kconfig
Simple merge