Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 10 Aug 2005 18:05:56 +0000 (11:05 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 10 Aug 2005 18:05:56 +0000 (11:05 -0700)

Trivial merge