Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 4 Nov 2005 18:42:53 +0000 (10:42 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 4 Nov 2005 18:42:53 +0000 (10:42 -0800)

Trivial merge