Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 06/06/1997 22:40:02
Fri Jun  6 15:38:12 PDT 1997
Update of /cvsroot/src/sys/dev
In directory netbsd1:/var/slash-tmp/cvs-serv19169

Log Message:
Matt Thomas's if_de driver, 1997/6/3 snapshot


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

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

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