Merge with ../linux-2.6-smp
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 29 Jun 2005 08:40:28 +0000 (09:40 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 29 Jun 2005 08:40:28 +0000 (09:40 +0100)

Trivial merge