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

This commit is contained in:
2005-05-25 22:11:38 -04:00 committed by Jeff Garzik
commit ad6a9984ee