Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 00:57:34 +0000 (16:57 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 00:57:34 +0000 (16:57 -0800)

Trivial merge