source-changes: CVS commit: src/sys/dev/pci

Subject: CVS commit: src/sys/dev/pci
To: None <source-changes@NetBSD.org>
From: Nick Hudson <skrll@netbsd.org>
List: source-changes
Date: 09/25/2005 06:45:26

Module Name:	src
Committed By:	skrll
Date:		Sun Sep 25 06:45:26 UTC 2005

Update of /cvsroot/src/sys/dev/pci
In directory ivanova.netbsd.org:/tmp/cvs-serv27506

Log Message:
Import of the FreeBSD sources from just after the net80211 merge. There
are no major changes, but this will make future merging easier.


Vendor Tag:	FreeBSD
Release Tags:	iwi-2005-07-11
		
C src/sys/dev/pci/if_iwivar.h
C src/sys/dev/pci/if_iwireg.h
C src/sys/dev/pci/if_iwi.c

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

	cvs checkout -jFreeBSD:yesterday -jFreeBSD src/sys/dev/pci