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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-exynos/Kconfig
index 5189bcecad1292c70f8a23e3cc30645a18cdfe52,c4989c2bcad8e874b842dcebe5bd2deb9b9ca751..207fa2c737a6d3d44a8278bbfab8bbc0b5902cad
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -25,9 -26,9 +26,10 @@@ menuconfig ARCH_EXYNO
        select PINCTRL_EXYNOS
        select PM_GENERIC_DOMAINS if PM
        select S5P_DEV_MFC
+       select SOC_SAMSUNG
        select SRAM
        select THERMAL
 +      select THERMAL_OF
        select MFD_SYSCON
        select CLKSRC_EXYNOS_MCT
        select POWER_RESET

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

diff --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc arch/arm64/configs/defconfig
index b81cdf94c89d79061bf806e2e3b31cab24bdaebf,df8f580b60e0d91e5a0b7ca12b1489a58b0d29b0..0f5194365e133653fc4278db5792daf58cfa553a
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -30,11 -31,9 +30,11 @@@ CONFIG_MODULES=
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_IOSCHED_DEADLINE is not set
 +CONFIG_ARCH_SUNXI=y
 +CONFIG_ARCH_ALPINE=y
  CONFIG_ARCH_BCM_IPROC=y
  CONFIG_ARCH_BERLIN=y
- CONFIG_ARCH_EXYNOS7=y
+ CONFIG_ARCH_EXYNOS=y
  CONFIG_ARCH_LAYERSCAPE=y
  CONFIG_ARCH_HISI=y
  CONFIG_ARCH_MEDIATEK=y

diff --cc drivers/clk/Kconfig
index 5bf16ccc010b71448b144cfd2772994d4a6b2be7,de707b2bfb73708789be3fa7dcf36d1aca7e7769..0e0c74c8c10d2c58c8214e2d312f762d9b876d40
--- 1/drivers/clk/Kconfig
--- 2/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -202,12 -202,9 +202,10 @@@ config COMMON_CLK_CDCE70
  
  source "drivers/clk/bcm/Kconfig"
  source "drivers/clk/hisilicon/Kconfig"
+ source "drivers/clk/mvebu/Kconfig"
  source "drivers/clk/qcom/Kconfig"
+ source "drivers/clk/samsung/Kconfig"
+ source "drivers/clk/tegra/Kconfig"
 +source "drivers/clk/ti/Kconfig"
  
  endmenu
- 
- source "drivers/clk/mvebu/Kconfig"
- 
- source "drivers/clk/samsung/Kconfig"
- source "drivers/clk/tegra/Kconfig"

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

diff --cc drivers/clk/rockchip/clk.c
Simple merge