Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 17 Oct 2008 13:29:03 +0000 (14:29 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 17 Oct 2008 13:29:03 +0000 (14:29 +0100)

Trivial merge