Merge branch 'master' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 22 Sep 2009 19:54:53 +0000 (20:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 22 Sep 2009 20:01:40 +0000 (21:01 +0100)

Trivial merge