Merge branch 's3c2410' of git://aeryn.fluff.org.uk/bjdooks/linux.git
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 26 Aug 2008 22:16:39 +0000 (23:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 26 Aug 2008 22:16:45 +0000 (23:16 +0100)

Trivial merge