Merge branch 'smp-fix'
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 17 May 2009 16:13:18 +0000 (17:13 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 17 May 2009 16:13:18 +0000 (17:13 +0100)

Trivial merge