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

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

diff --cc arch/arm/mach-exynos4/mach-smdkv310.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-s5pv210/cpu.c
Simple merge

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