Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 9 Sep 2005 20:17:43 +0000 (13:17 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 9 Sep 2005 20:17:43 +0000 (13:17 -0700)

Trivial merge