NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

veego
Sun Mar 23 01:37:32 PST 1997
Update of /cvsroot/src/sys/dev/pci
In directory netbsd1:/var/slash-tmp/cvs-serv20676

Modified Files:
        if_de.c if_devar.h 
Log Message:
Resolve conflicts from merge.