Automatic merge of /spare/repo/netdev-2.6 branch forcedeth

This commit is contained in:
2005-05-25 22:10:25 -04:00 committed by Jeff Garzik
commit acb969560d