Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 6 Mar 2009 21:53:05 +0000 (21:53 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 6 Mar 2009 21:53:05 +0000 (21:53 +0000)

Trivial merge