Merge branch 'misc' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Mar 2011 23:35:25 +0000 (23:35 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Mar 2011 23:35:25 +0000 (23:35 +0000)
Conflicts:
arch/arm/Kconfig


Trivial merge