cgd
Mon Jul 24 01:24:39 EDT 1995
Update of /a/cvsroot/src/sys/dev/ic
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv23381

Revision/Branch: 1.1.1

Log Message:
latest from matt thomas; right name this time.

Status:

Vendor Tag:	thomas
Release Tags:	thomas-de-950717
		
C src/sys/dev/ic/dc21040reg.h

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

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


cgd
Mon Jul 24 01:27:02 EDT 1995
Update of /a/cvsroot/src/sys/dev/ic
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv23458

Modified Files:
	dc21040reg.h 
Log Message:
merge changes from update