Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 28 Mar 2011 17:52:44 +0000 (18:52 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 28 Mar 2011 17:52:44 +0000 (18:52 +0100)
1  2 
arch/arm/Kconfig

Simple merge