Merge branch 'smp' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 1 Jun 2009 17:35:26 +0000 (18:35 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 1 Jun 2009 17:35:26 +0000 (18:35 +0100)

Trivial merge