Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Jul 2005 16:47:08 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Jul 2005 16:47:08 +0000 (09:47 -0700)

Trivial merge