Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 30 Jul 2009 09:47:55 +0000 (10:47 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 30 Jul 2009 09:47:55 +0000 (10:47 +0100)

Trivial merge