Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Oct 2005 00:16:55 +0000 (17:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Oct 2005 00:16:55 +0000 (17:16 -0700)

Trivial merge