Merge branch 'next-s3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 18 Sep 2009 19:55:56 +0000 (20:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 18 Sep 2009 19:55:56 +0000 (20:55 +0100)

Trivial merge