Merge with ARM SMP tree
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 9 Nov 2005 14:57:32 +0000 (14:57 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 Nov 2005 14:57:32 +0000 (14:57 +0000)

Trivial merge