Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Oct 2005 21:02:49 +0000 (14:02 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Oct 2005 21:02:49 +0000 (14:02 -0700)

Trivial merge