Merge branch 'for-2636/s3c64xx' into for-linus/samsung-2635
authorBen Dooks <ben-linux@fluff.org>
Sat, 14 Aug 2010 15:34:38 +0000 (16:34 +0100)
committerBen Dooks <ben-linux@fluff.org>
Sat, 14 Aug 2010 15:34:38 +0000 (16:34 +0100)

Trivial merge