Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 16 May 2005 17:34:52 +0000 (10:34 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 16 May 2005 17:34:52 +0000 (10:34 -0700)

Trivial merge