Merge branch 'next-s3c64xx-fixes' into next-s3c-fixes
authorBen Dooks <ben-linux@fluff.org>
Thu, 17 Sep 2009 09:12:48 +0000 (10:12 +0100)
committerBen Dooks <ben-linux@fluff.org>
Thu, 17 Sep 2009 09:12:48 +0000 (10:12 +0100)

Trivial merge