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-Tag: v3.2-rc1~40^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86f82da586098f16d92b5637808c323f5455e935;p=pandora-kernel.git Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2 Conflicts: arch/arm/plat-s5p/include/plat/pll.h --- 86f82da586098f16d92b5637808c323f5455e935 Reading git-diff-tree failed