Merge branch 'next-s3c64xx' into next-merged
authorBen Dooks <ben-linux@fluff.org>
Thu, 18 Dec 2008 14:52:04 +0000 (14:52 +0000)
committerBen Dooks <ben-linux@fluff.org>
Thu, 18 Dec 2008 14:52:04 +0000 (14:52 +0000)

Trivial merge