From: Arnd Bergmann Date: Sat, 8 Oct 2011 20:11:19 +0000 (+0200) Subject: Merge branch 'next/cleanup2' into for-next X-Git-Tag: next-20111011~106^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ecee002c79ed61db6034f329cc388f267f23c96;p=karo-tx-linux.git Merge branch 'next/cleanup2' into for-next Conflicts: arch/arm/plat-s5p/include/plat/pll.h --- 5ecee002c79ed61db6034f329cc388f267f23c96