Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 14 Sep 2005 22:27:39 +0000 (15:27 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 14 Sep 2005 22:27:39 +0000 (15:27 -0700)

Trivial merge