Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:32:46 +0000 (21:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:32:46 +0000 (21:32 -0800)

Trivial merge