Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 25 Feb 2006 00:01:07 +0000 (16:01 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 25 Feb 2006 00:01:07 +0000 (16:01 -0800)

Trivial merge