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

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc drivers/cpufreq/Kconfig.arm
Simple merge

diff --cc drivers/pinctrl/Makefile
Simple merge

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

diff --cc drivers/pinctrl/pinctrl-samsung.h
Simple merge