Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 23 Oct 2005 17:10:37 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 23 Oct 2005 17:10:37 +0000 (10:10 -0700)

Trivial merge