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

This commit is contained in:
2005-06-04 17:03:55 -04:00 committed by Jeff Garzik
commit 21035ffeb7