Subject: CVS commit: [nathanw_sa] syssrc/sys/dev/pci
To: None <source-changes@netbsd.org>
From: Gregory McGarry <gmcgarry@netbsd.org>
List: source-changes
Date: 10/05/2002 07:59:47
Module Name:	syssrc
Committed By:	gmcgarry
Date:		Sat Oct  5 04:59:46 UTC 2002

Modified Files:
	syssrc/sys/dev/pci [nathanw_sa]: if_wi_pci.c

Log Message:
Remove CVS conflicts.


To generate a diff of this commit:
cvs rdiff -r1.1.2.5 -r1.1.2.6 syssrc/sys/dev/pci/if_wi_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.