NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

thorpej
Tue Mar 25 17:30:03 PST 1997
Update of /cvsroot/src/sys/dev
In directory netbsd1:/var/slash-tmp/cvs-serv5711

Log Message:
Update from Matt Thomas <matt%3am-software.com@localhost>.  Fixes a couple of
media-related bugs, and now properly groks Asante versions of Tulip
cards.

Status:

Vendor Tag:     thomas
Release Tags:   de-970325
                
U src/sys/dev/ic/dc21040reg.h
C src/sys/dev/pci/if_de.c
C src/sys/dev/pci/if_devar.h

2 conflicts created by this import.
Use the following command to help the merge:

        cvs checkout -jthomas:yesterday -jthomas src/sys/dev


thorpej
Tue Mar 25 17:33:35 PST 1997
Update of /cvsroot/src/sys/dev/pci
In directory netbsd1:/var/slash-tmp/cvs-serv6574/pci

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