thorpej
Sun Mar 23 16:30:10 PST 1997
Update of /cvsroot/src/sys
In directory netbsd1:/var/slash-tmp/cvs-serv29080

Log Message:
Update from Matt Thomas <matt@3am-software.com>.  Notable highlight:
the DEFTA (TurboChannel) card now works on the Alpha!

Status:

Vendor Tag:	thomas
Release Tags:	pdq-970321
		
C src/sys/dev/eisa/if_fea.c
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
C src/sys/dev/tc/if_fta.c
C src/sys/net/if_fddi.h
C src/sys/net/if_fddisubr.c

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

	cvs checkout -jthomas:yesterday -jthomas src/sys


thorpej
Sun Mar 23 16:35:06 PST 1997
Update of /cvsroot/src/sys/net
In directory netbsd1:/var/slash-tmp/cvs-serv29353/net

Modified Files:
	if_fddi.h if_fddisubr.c 
Log Message:
Resolve conflicts from merge.


thorpej
Sun Mar 23 16:35:09 PST 1997
Update of /cvsroot/src/sys/dev/eisa
In directory netbsd1:/var/slash-tmp/cvs-serv29353/dev/eisa

Modified Files:
	if_fea.c 
Log Message:
Resolve conflicts from merge.


thorpej
Sun Mar 23 16:35:19 PST 1997
Update of /cvsroot/src/sys/dev/ic
In directory netbsd1:/var/slash-tmp/cvs-serv29353/dev/ic

Modified Files:
	pdq.c pdq_ifsubr.c pdqreg.h pdqvar.h 
Log Message:
Resolve conflicts from merge.


thorpej
Sun Mar 23 16:35:21 PST 1997
Update of /cvsroot/src/sys/dev/pci
In directory netbsd1:/var/slash-tmp/cvs-serv29353/dev/pci

Modified Files:
	if_fpa.c 
Log Message:
Resolve conflicts from merge.


thorpej
Sun Mar 23 16:35:23 PST 1997
Update of /cvsroot/src/sys/dev/tc
In directory netbsd1:/var/slash-tmp/cvs-serv29353/dev/tc

Modified Files:
	if_fta.c 
Log Message:
Resolve conflicts from merge.