Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Sep 2005 16:00:04 +0000 (09:00 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Sep 2005 16:00:04 +0000 (09:00 -0700)

Trivial merge