Merge branch 'origin'
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Sep 2010 21:38:43 +0000 (22:38 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Sep 2010 21:38:43 +0000 (22:38 +0100)

Trivial merge