Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 01:48:37 +0000 (17:48 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 01:48:37 +0000 (17:48 -0800)

Trivial merge