Merge with ARM SMP tree
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 7 Nov 2005 21:04:24 +0000 (21:04 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Nov 2005 21:04:24 +0000 (21:04 +0000)

Trivial merge