From: Kukjin Kim Date: Tue, 4 Oct 2011 11:20:08 +0000 (+0900) Subject: Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=86f82da586098f16d92b5637808c323f5455e935;p=linux-beck.git Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2 Conflicts: arch/arm/plat-s5p/include/plat/pll.h --- 86f82da586098f16d92b5637808c323f5455e935