Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 15 Mar 2011 16:32:47 +0000 (16:32 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 15 Mar 2011 16:32:47 +0000 (16:32 +0000)
Conflicts:
arch/arm/mm/Kconfig


Trivial merge