Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 May 2010 07:49:25 +0000 (08:49 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 May 2010 07:49:25 +0000 (08:49 +0100)
1  2 
arch/arm/Kconfig
arch/arm/Makefile

Simple merge
Simple merge