Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Oct 2005 15:40:46 +0000 (08:40 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Oct 2005 15:40:46 +0000 (08:40 -0700)

Trivial merge