Merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 21 May 2005 22:04:27 +0000 (15:04 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 21 May 2005 22:04:27 +0000 (15:04 -0700)

Trivial merge