Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 15 Aug 2009 11:43:13 +0000 (12:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 15 Aug 2009 11:43:13 +0000 (12:43 +0100)

Trivial merge