Merge branch 'next/cleanup2' into for-next

Conflicts:
	arch/arm/plat-s5p/include/plat/pll.h

diff --cc arch/arm/mach-s3c2410/mach-h1940.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

diff --cc arch/arm/plat-samsung/include/plat/exynos4.h
Simple merge