thorpej
Tue Mar 18 18:31:17 PST 1997
Update of /cvsroot/src/sys/dev
In directory netbsd1:/var/slash-tmp/cvs-serv15013

Log Message:
Update from Matt Thomas.  Fixes several media-selection and full-duplex
related bugs.  Also, fix a bug that was causing hangs and machine-checks
on Alpha systems in some cases.

Status:

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

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

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


thorpej
Tue Mar 18 18:37:40 PST 1997
Update of /cvsroot/src/sys/dev/pci
In directory netbsd1:/var/slash-tmp/cvs-serv15682

Modified Files:
	if_de.c if_devar.h 
Log Message:
Resolve conflicts from merge.