Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 26 Oct 2007 10:50:02 +0000 (03:50 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 26 Oct 2007 10:50:02 +0000 (03:50 -0700)

Trivial merge