From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 06:45:11 +0000 (+1000)
Subject: Merge remote-tracking branch 'samsung/for-next'
X-Git-Tag: next-20130619~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a025141a00cb078939d808b62513543997ddde03;p=karo-tx-linux.git

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

Conflicts:
	drivers/usb/Kconfig
---

a025141a00cb078939d808b62513543997ddde03
diff --cc arch/arm/mach-exynos/Kconfig
index 756970f6bd10,4f4f1042a57a..359af2c72c0e
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -76,9 -93,8 +93,8 @@@ config SOC_EXYNOS544
  	default y
  	depends on ARCH_EXYNOS5
  	select ARCH_HAS_OPP
 -	select ARM_ARCH_TIMER
 +	select HAVE_ARM_ARCH_TIMER
  	select AUTO_ZRELADDR
- 	select PINCTRL
  	select PINCTRL_EXYNOS5440
  	select PM_OPP
  	help