Module Name: src Committed By: christos Date: Tue Dec 27 01:31:06 UTC 2016
Modified Files: src/sys/net: if_pppoe.c Log Message: fix merge conflict. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_pppoe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.