Merge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 26 Mar 2009 22:44:43 +0000 (22:44 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 26 Mar 2009 22:44:43 +0000 (22:44 +0000)

Trivial merge