Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 10 Jun 2009 21:40:55 +0000 (22:40 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 10 Jun 2009 21:41:06 +0000 (22:41 +0100)

Trivial merge