Merge branch 'v2630-rc3-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <[email protected]>
Sun, 3 May 2009 09:53:21 +0000 (10:53 +0100)
committerRussell King <[email protected]>
Sun, 3 May 2009 09:53:21 +0000 (10:53 +0100)

Trivial merge