[ARM] Merge SMP tree
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 3 Nov 2005 21:02:39 +0000 (21:02 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Nov 2005 21:02:39 +0000 (21:02 +0000)

Trivial merge