source-changes: NetBSD master CVS tree commits

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:50:03

thorpej
Mon Mar 11 13:41:37 PST 1996
Update of /a/cvsroot/src/sys/dev/ic
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv6406/ic

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


thorpej
Mon Mar 11 13:41:39 PST 1996
Update of /a/cvsroot/src/sys/dev/pci
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv6406/pci

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