sun-lamp CVS commits

[The Source of All Evil <source>]

cgd
Sat Jul 22 15:30:42 EDT 1995
Update of /a/cvsroot/src/sys/dev
In directory pain.lcs.mit.edu:/a/tmp/dev

Revision/Branch: 1.1.1

Log Message:
latest if_de, from Matt Thomas

Status:

Vendor Tag:     thomas
Release Tags:   thomas-de-950717
                
C src/sys/dev/ic/dc21040.h
C src/sys/dev/pci/if_de.c

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

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