Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
Kukjin Kim [Tue, 4 Oct 2011 11:20:08 +0000 (20:20 +0900)]
Conflicts:
arch/arm/plat-s5p/include/plat/pll.h

1  2 
arch/arm/mach-s3c2416/clock.c
arch/arm/mach-s3c64xx/clock.c
arch/arm/mach-s3c64xx/cpu.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/plat-samsung/include/plat/exynos4.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge