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

diff --cc arch/arm/boot/dts/Makefile
index 6a5aac97856bf40b53f68969629c4ae1746068ac,36488a58940bd998945198e4d3a29bf4fb4a8ac6..8cfd01395acea01fe84c5d87901c0f94ebc71d63
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -35,9 -23,9 +35,10 @@@ dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510
  dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
        exynos4210-trats.dtb \
+       exynos4412-smdk4412.dtb \
        exynos5250-smdk5250.dtb
 -dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
 +dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
 +      ecx-2000.dtb
  dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
        integratorcp.dtb
  dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb

diff --cc drivers/pinctrl/pinctrl-exynos.c
Simple merge