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>
Thu, 10 Mar 2011 13:53:29 +0000 (13:53 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 10 Mar 2011 13:53:29 +0000 (13:53 +0000)
1  2 
arch/arm/mm/Kconfig

Simple merge