Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 22:12:54 +0000 (15:12 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 22:12:54 +0000 (15:12 -0700)

Trivial merge