Merge branch 'v2630-rc2-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 17 Apr 2009 20:35:44 +0000 (21:35 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 17 Apr 2009 20:35:44 +0000 (21:35 +0100)

Trivial merge