Merge with ../linux-2.6-smp
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 19 Jun 2005 20:50:20 +0000 (21:50 +0100)
committerRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 19 Jun 2005 20:50:20 +0000 (21:50 +0100)

Trivial merge