Merge branch 'sa1100'
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 17 May 2008 21:55:51 +0000 (22:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 17 May 2008 21:55:51 +0000 (22:55 +0100)

Trivial merge