Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 23:24:36 +0000 (15:24 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 23:24:36 +0000 (15:24 -0800)

Trivial merge