ARM: Merge for-2635/s5p-dma

Merge branch 'for-2635/s5p-dma' into for-linus/samsung2

Conflicts:
	arch/arm/mach-s5pv210/Makefile

diff --cc arch/arm/mach-s5pv210/Makefile
index 0acbdb3,f7f1cdc..192deac
--- 1/arch/arm/mach-s5pv210/Makefile
--- 2/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@@ -12,7 -12,7 +12,7 @@@ obj-                          :
  
  # Core support for S5PV210 system
  
- obj-$(CONFIG_CPU_S5PV210)     += cpu.o init.o clock.o gpiolib.o
 -obj-$(CONFIG_CPU_S5PV210)     += cpu.o init.o clock.o dma.o
++obj-$(CONFIG_CPU_S5PV210)     += cpu.o init.o clock.o dma.o gpiolib.o
  
  # machine support
  

diff --cc arch/arm/plat-samsung/Kconfig
Simple merge

diff --cc arch/arm/plat-samsung/Makefile
Simple merge