Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 1 Jul 2005 00:04:54 +0000 (17:04 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 1 Jul 2005 00:04:54 +0000 (17:04 -0700)

Trivial merge