Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 23:58:55 +0000 (16:58 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 23:58:55 +0000 (16:58 -0700)

Trivial merge