Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
authorKukjin Kim <kgene.kim@samsung.com>
Tue, 4 Oct 2011 11:20:08 +0000 (20:20 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 4 Oct 2011 11:20:08 +0000 (20:20 +0900)
commit86f82da586098f16d92b5637808c323f5455e935
tree6397eb5550172b89d383254c7e4bca87ae4a8659
parentdb3c94a7edc6b29f8d52ba5884dec6a15feeadad
parente90a0f3c460406d6a5a698016bc525c3e6968cb6
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2

Conflicts:
arch/arm/plat-s5p/include/plat/pll.h
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