Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 22 Jun 2009 13:31:57 +0000 (14:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 22 Jun 2009 13:31:57 +0000 (14:31 +0100)

Trivial merge