Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 31 Dec 2005 21:49:26 +0000 (13:49 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 31 Dec 2005 21:49:26 +0000 (13:49 -0800)

Trivial merge