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

This commit is contained in:
2005-05-25 13:56:55 -04:00 committed by Jeff Garzik
commit d6d78f63ce