Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 9 Aug 2010 13:07:19 +0000 (14:07 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 9 Aug 2010 13:07:19 +0000 (14:07 +0100)
Conflicts:
arch/arm/Kconfig


Trivial merge