Automatic merge of /spare/repo/netdev-2.6 branch r8169-fix

This commit is contained in:
2005-06-04 04:31:44 -04:00 committed by Jeff Garzik
commit 910313aa1d