source-changes: NetBSD master CVS tree commits

Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 03/23/1997 09:40:02

veego
Sun Mar 23 01:37:32 PST 1997
Update of /cvsroot/src/sys/dev/pci
In directory netbsd1:/var/slash-tmp/cvs-serv20676

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