Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 01/11/1997 04:40:02
thorpej
Fri Jan 10 20:30:08 PST 1997
Update of /cvsroot/src/sys/dev
In directory netbsd1:/var/slash-tmp/cvs-serv14030

Log Message:
Update from Matt Thomas <matt@3am-software.com>.  Supports more
Tulip-based cards, including new SMC and Kingston cards.

Status:

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

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

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