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

Conflicts:
	arch/arm/mach-exynos4/Kconfig
	drivers/gpio/Makefile

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos4/Kconfig
index a65273598036011e4d05af2d58a544532adfa830,dd660eb2020482b544ba762beb89134eb1e2f40a..bd26d0d827224e64b2b37f7f6c7d293d495d48c6
--- 1/arch/arm/mach-exynos4/Kconfig
--- 2/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -11,8 -11,9 +11,10 @@@ if ARCH_EXYNOS
  
  config CPU_EXYNOS4210
        bool
-       select S3C_PL330_DMA
+       select SAMSUNG_DMADEV
+       select S5P_PM if PM
+       select S5P_SLEEP if PM
 +      select ARM_CPU_SUSPEND if PM
        help
          Enable EXYNOS4210 CPU support
  

diff --cc arch/arm/mach-exynos4/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-exynos4/mach-universal_c210.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/cpu.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/mach-smdk6440.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/mach-smdk6450.c
Simple merge

diff --cc arch/arm/mach-s5pv210/cpu.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-goni.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
index 19c5d27b6d2e916216594bca14e7243983634bf1,62db458c850d1e5fc83c544e7a30b412c942d932..24093870d8028451c2f36e2e19decd1bc5c47c1b
--- 1/drivers/gpio/Makefile
--- 2/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -14,14 -14,10 +14,13 @@@ obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5
  obj-$(CONFIG_GPIO_BT8XX)      += gpio-bt8xx.o
  obj-$(CONFIG_GPIO_CS5535)     += gpio-cs5535.o
  obj-$(CONFIG_GPIO_DA9052)     += gpio-da9052.o
 +obj-$(CONFIG_ARCH_DAVINCI)    += gpio-davinci.o
  obj-$(CONFIG_GPIO_EP93XX)     += gpio-ep93xx.o
- obj-$(CONFIG_GPIO_EXYNOS4)    += gpio-exynos4.o
  obj-$(CONFIG_GPIO_IT8761E)    += gpio-it8761e.o
  obj-$(CONFIG_GPIO_JANZ_TTL)   += gpio-janz-ttl.o
 +obj-$(CONFIG_MACH_KS8695)     += gpio-ks8695.o
  obj-$(CONFIG_GPIO_LANGWELL)   += gpio-langwell.o
 +obj-$(CONFIG_ARCH_LPC32XX)    += gpio-lpc32xx.o
  obj-$(CONFIG_GPIO_MAX730X)    += gpio-max730x.o
  obj-$(CONFIG_GPIO_MAX7300)    += gpio-max7300.o
  obj-$(CONFIG_GPIO_MAX7301)    += gpio-max7301.o
@@@ -40,13 -36,8 +39,10 @@@ obj-$(CONFIG_GPIO_PCA953X)  += gpio-pca9
  obj-$(CONFIG_GPIO_PCF857X)    += gpio-pcf857x.o
  obj-$(CONFIG_GPIO_PCH)                += gpio-pch.o
  obj-$(CONFIG_GPIO_PL061)      += gpio-pl061.o
 +obj-$(CONFIG_PLAT_PXA)                += gpio-pxa.o
  obj-$(CONFIG_GPIO_RDC321X)    += gpio-rdc321x.o
- 
- obj-$(CONFIG_GPIO_PLAT_SAMSUNG)       += gpio-plat-samsung.o
- obj-$(CONFIG_GPIO_S5PC100)    += gpio-s5pc100.o
- obj-$(CONFIG_GPIO_S5PV210)    += gpio-s5pv210.o
 +obj-$(CONFIG_ARCH_SA1100)     += gpio-sa1100.o
+ obj-$(CONFIG_PLAT_SAMSUNG)    += gpio-samsung.o
  obj-$(CONFIG_GPIO_SCH)                += gpio-sch.o
  obj-$(CONFIG_GPIO_STMPE)      += gpio-stmpe.o
  obj-$(CONFIG_GPIO_SX150X)     += gpio-sx150x.o