Merge branch 'v3.13-next/samsung' into for-next

Conflicts:
	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index e639a301444db56712bd86fa6e161be273520eac,1ac305ed63d1181899694333a836d6dd1218058e..4a2e76fc1f606299c0f449363bbfe013c005b029
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -727,8 -727,7 +727,8 @@@ config ARCH_S3C64X
        select ARM_VIC
        select CLKDEV_LOOKUP
        select CLKSRC_SAMSUNG_PWM
-       select CPU_V6
 +      select COMMON_CLK
+       select CPU_V6K
        select GENERIC_CLOCKEVENTS
        select GPIO_SAMSUNG
        select HAVE_CLK