Merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 29 Apr 2005 22:08:34 +0000 (15:08 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 29 Apr 2005 22:08:34 +0000 (15:08 -0700)

Trivial merge