]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitcc5cbab5f1f69c8bf6347046a05e9af50ad4a27c
tree44a37ecc299369c451a9718c6cbfcad92904cc20
parentde88fdead6e3f76f2e5288bddc26a1d75a37ef04
parent1e4530a12a071773a16683b9e05de6cf0bdde991
Merge branch 'next-samsung-cleanup-2' into for-next

Conflicts:
arch/arm/plat-s5p/include/plat/pll.h
arch/arm/mach-s3c64xx/clock.c