Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 06/08/1997 19:40:04
Sun Jun  8 12:36:39 PDT 1997
Update of /cvsroot/src/sys/dev
In directory netbsd1:/var/slash-tmp/cvs-serv27193

Log Message:
Update of DEC PDQ FDDI driver, from Matt Thomas <>.


Vendor Tag:	thomas
Release Tags:	pdq-970604
U src/sys/dev/tc/if_fta.c
C src/sys/dev/pci/if_fpa.c
U src/sys/dev/eisa/if_fea.c
C src/sys/dev/ic/pdq.c
C src/sys/dev/ic/pdq_ifsubr.c
U src/sys/dev/ic/pdqreg.h
U src/sys/dev/ic/pdqvar.h

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

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