Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 29 Nov 2008 19:35:07 +0000 (19:35 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 29 Nov 2008 19:35:07 +0000 (19:35 +0000)

Trivial merge