Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
1  2 
arch/arm/Kconfig
arch/arm/Makefile

Simple merge
Simple merge