Subject: CVS commit: src
To: None <source-changes@NetBSD.org>
From: Nick Hudson <skrll@netbsd.org>
List: source-changes
Date: 11/18/2005 16:23:42
Module Name:	src
Committed By:	skrll
Date:		Fri Nov 18 16:23:42 UTC 2005

Update of /cvsroot/src
In directory ivanova.netbsd.org:/tmp/cvs-serv29394

Log Message:
Import FreeBSD's iwi(4) of 1-nov-2005


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

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

	cvs checkout -jFreeBSD:yesterday -jFreeBSD src