From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:49:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'samsung/for-next'
X-Git-Tag: next-20131025~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6ed6de455fc992a489377d5c587cf00565ea3241;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-exynos/mach-exynos4-dt.c
---

6ed6de455fc992a489377d5c587cf00565ea3241
diff --cc arch/arm/Kconfig
index 1a777ddb7348,4a2e76fc1f60..d68898ac36f3
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -725,9 -728,10 +725,9 @@@ config ARCH_S3C64X
  	select CLKDEV_LOOKUP
  	select CLKSRC_SAMSUNG_PWM
  	select COMMON_CLK
- 	select CPU_V6
+ 	select CPU_V6K
  	select GENERIC_CLOCKEVENTS
  	select GPIO_SAMSUNG
 -	select HAVE_CLK
  	select HAVE_S3C2410_I2C if I2C
  	select HAVE_S3C2410_WATCHDOG if WATCHDOG
  	select HAVE_TCM