Merge with ../linux-2.6-smp
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 18 Jun 2005 08:06:59 +0000 (09:06 +0100)
committerRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 18 Jun 2005 08:06:59 +0000 (09:06 +0100)

Trivial merge