Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 03/11/1996 16:10:04
Mon Mar 11 13:04:09 PST 1996
Update of /a/cvsroot/src/sys/dev
In directory

Revision/Branch: 1.1.1

Log Message:
New snapshot of DEC PDQ-based FDDI driver, from Matt Thomas.


Vendor Tag:	thomas
Release Tags:	thomas-pdq-960311
C src/sys/dev/ic/pdq.c
C src/sys/dev/ic/pdq_ifsubr.c
C src/sys/dev/ic/pdqreg.h
C src/sys/dev/ic/pdqvar.h
C src/sys/dev/pci/if_fpa.c

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

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