Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 23:09:03 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 23:09:03 +0000 (15:09 -0800)

Trivial merge