Merge branch 'origin' into misc
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 27 Jul 2010 09:42:48 +0000 (10:42 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 27 Jul 2010 09:42:52 +0000 (10:42 +0100)

Trivial merge