Merge branch 'next-s5pv310' into for-next

Conflicts:
	arch/arm/mach-s5pv310/Makefile

diff --cc arch/arm/mach-s5pv310/Makefile
index e01a4d050a4c17ad1ec1c4bc3da835595adef3f9,ef9650827136210dcab68496e79887d6029188d7..651f1933e22856c121a55cc2740d6dd522ded72c
--- 1/arch/arm/mach-s5pv310/Makefile
--- 2/arch/arm/mach-s5pv310/Makefile
+++ b/arch/arm/mach-s5pv310/Makefile
@@@ -13,7 -13,8 +13,8 @@@ obj-                          :
  # Core support for S5PV310 system
  
  obj-$(CONFIG_CPU_S5PV310)     += cpu.o init.o clock.o irq-combiner.o
 -obj-$(CONFIG_CPU_S5PV310)     += setup-i2c0.o time.o gpiolib.o irq-eint.o
 +obj-$(CONFIG_CPU_S5PV310)     += setup-i2c0.o time.o gpiolib.o irq-eint.o dma.o
+ obj-$(CONFIG_CPU_FREQ)                += cpufreq.o
  
  obj-$(CONFIG_SMP)             += platsmp.o headsmp.o
  obj-$(CONFIG_LOCAL_TIMERS)    += localtimer.o

diff --cc arch/arm/mach-s5pv310/clock.c
Simple merge

diff --cc arch/arm/mach-s5pv310/include/mach/map.h
Simple merge