Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 24 Jul 2005 00:01:26 +0000 (17:01 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 24 Jul 2005 00:01:26 +0000 (17:01 -0700)

Trivial merge