]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next-samsung-cleanup-2' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 26 Sep 2011 23:24:48 +0000 (08:24 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 26 Sep 2011 23:24:48 +0000 (08:24 +0900)
Conflicts:
arch/arm/plat-s5p/include/plat/pll.h

1  2 
arch/arm/mach-s3c64xx/clock.c

Simple merge