Merge with ARM SMP tree
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 8 Nov 2005 22:43:44 +0000 (22:43 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 8 Nov 2005 22:43:44 +0000 (22:43 +0000)

Trivial merge