Merge branch 'fixes-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <[email protected]>
Sat, 16 May 2009 16:54:19 +0000 (17:54 +0100)
committerRussell King <[email protected]>
Sat, 16 May 2009 16:54:19 +0000 (17:54 +0100)

Trivial merge