Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 07:14:47 +0000 (00:14 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 07:14:47 +0000 (00:14 -0700)

Trivial merge