source-changes: NetBSD master CVS tree commits

Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 08/25/1997 18:40:04

thorpej
Mon Aug 25 11:38:00 PDT 1997
Update of /cvsroot/src/sys/dev
In directory netbsd1:/var/slash-tmp/cvs-serv12951

Log Message:
Import the 970703 snapshot of Matt Thomas's "de" driver.

Status:

Vendor Tag:	thomas
Release Tags:	de-970703
		
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