Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 17:33:54 +0000 (17:33 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 17:33:54 +0000 (17:33 +0000)
Conflicts:
arch/arm/Kconfig


Trivial merge