Merge branch 'master' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Sep 2009 11:04:37 +0000 (12:04 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Sep 2009 11:04:37 +0000 (12:04 +0100)

Trivial merge