Merge branch 'next/cleanup-samsung' into next/cleanup-samsung-2

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

diff --cc arch/arm/mach-exynos/common.c
Simple merge

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

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

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

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