Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
authorLinus Torvalds <[email protected]>
Wed, 2 Nov 2005 05:33:06 +0000 (21:33 -0800)
committerLinus Torvalds <[email protected]>
Wed, 2 Nov 2005 05:33:06 +0000 (21:33 -0800)

Trivial merge