Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 18:42:44 +0000 (11:42 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 18:42:44 +0000 (11:42 -0700)

Trivial merge