Merge branch 'rmk-next' into s3c64xx
authorBen Dooks <ben-linux@fluff.org>
Tue, 2 Dec 2008 19:05:42 +0000 (19:05 +0000)
committerBen Dooks <ben-linux@fluff.org>
Tue, 2 Dec 2008 19:05:42 +0000 (19:05 +0000)

Trivial merge