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

Conflicts:
	drivers/usb/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

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

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

diff --cc arch/arm/mach-exynos/Kconfig
index 756970f6bd105b3a206a38c89548c1fe9a6815a0,4f4f1042a57a45eda80f52497e82b43597c29cbc..359af2c72c0e020169eb6b9e52eb7fe2da6854db
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -76,9 -93,8 +93,8 @@@ config SOC_EXYNOS544
        default y
        depends on ARCH_EXYNOS5
        select ARCH_HAS_OPP
 -      select ARM_ARCH_TIMER
 +      select HAVE_ARM_ARCH_TIMER
        select AUTO_ZRELADDR
-       select PINCTRL
        select PINCTRL_EXYNOS5440
        select PM_OPP
        help

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

diff --cc drivers/clk/samsung/clk-exynos5250.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/media/platform/Kconfig
Simple merge

diff --cc drivers/media/platform/exynos4-is/Kconfig
Simple merge

diff --cc drivers/pinctrl/Kconfig
Simple merge

diff --cc drivers/thermal/exynos_thermal.c
Simple merge

diff --cc drivers/tty/serial/samsung.c
Simple merge

diff --cc drivers/usb/host/Kconfig
Simple merge

diff --cc drivers/watchdog/s3c2410_wdt.c
Simple merge