Merge branch 's3c-fixes-rc4-2' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 3 Aug 2009 16:58:02 +0000 (17:58 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 Aug 2009 16:58:02 +0000 (17:58 +0100)

Trivial merge