Merge branch 'misc' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 31 Jul 2010 13:20:02 +0000 (14:20 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 31 Jul 2010 13:20:02 +0000 (14:20 +0100)
Conflicts:
arch/arm/mm/init.c


Trivial merge