Merge branch 'misc2' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:09:41 +0000 (22:09 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:09:41 +0000 (22:09 +0000)

Trivial merge