CVS commit: [christos-time_t] src/sys/net

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Mon Nov 10 00:03:37 UTC 2008

Modified Files:
        src/sys/net [christos-time_t]: if.c

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.218.2.3 -r1.218.2.4 src/sys/net/if.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.