Merge S3Cxxxx branch
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 20 Jun 2006 19:57:34 +0000 (20:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 20 Jun 2006 19:57:34 +0000 (20:57 +0100)

Trivial merge