Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 27 Oct 2005 23:58:20 +0000 (16:58 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 27 Oct 2005 23:58:20 +0000 (16:58 -0700)

Trivial merge