Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 04:00:38 +0000 (21:00 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 04:00:38 +0000 (21:00 -0700)

Trivial merge