Merge branch 'sa1100' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Dec 2009 17:00:33 +0000 (17:00 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Dec 2009 17:00:33 +0000 (17:00 +0000)

Trivial merge