Automatic merge of kernel.org:/home/rmk/linux-2.6-serial.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 26 Apr 2005 16:02:40 +0000 (09:02 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 26 Apr 2005 16:02:40 +0000 (09:02 -0700)

Trivial merge