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: 12/20/2005 07:41:13

Module Name:	src
Committed By:	skrll
Date:		Tue Dec 20 07:41:13 UTC 2005

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

Log Message:
Import of the ipw(4) FreeBSD sources from 14-Nov-2005 (just after the
last net80211 merge) as a step towards a working driver and to make
future merging easier.


Vendor Tag:	FreeBSD
Release Tags:	ipw-14-nov-2005
		
C src/sys/dev/pci/if_ipwreg.h
C src/sys/dev/pci/if_ipw.c
C src/sys/dev/pci/if_ipwvar.h

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

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