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


Trivial merge