ARM: Merge for-2637/s3c24xx/misc
authorBen Dooks <ben-linux@fluff.org>
Fri, 29 Oct 2010 23:46:55 +0000 (00:46 +0100)
committerBen Dooks <ben-linux@fluff.org>
Fri, 29 Oct 2010 23:46:55 +0000 (00:46 +0100)

Trivial merge