Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 21 Oct 2005 19:22:33 +0000 (12:22 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 21 Oct 2005 19:22:33 +0000 (12:22 -0700)

Trivial merge