Merge branch 'for-rmk' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 9 Aug 2008 13:09:32 +0000 (14:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 9 Aug 2008 13:09:32 +0000 (14:09 +0100)

Trivial merge