Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Feb 2006 16:13:38 +0000 (08:13 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Feb 2006 16:13:38 +0000 (08:13 -0800)

Trivial merge