Module Name:	src
Committed By:	dyoung
Date:		Mon Dec 15 03:34:26 UTC 2003

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

Log Message:
Import FreeBSD's ath of 12-dec-2003


Vendor Tag:	FreeBSD
Release Tags:	ath-12-dec-2003
		
C src/sys/dev/ic/ath.c
C src/sys/dev/ic/athioctl.h
C src/sys/dev/ic/athvar.h
C src/sys/dev/pci/if_ath_pci.c
U src/contrib/sys/arch/i386/dev/athhal_opt.h
C src/contrib/sys/dev/ic/athhal_osdep.c
C src/contrib/sys/dev/ic/athhal_osdep.h
U src/contrib/sys/dev/ic/athhal_if.m
C src/contrib/sys/dev/ic/athhal.h
U src/contrib/sys/dev/ic/athhal_desc.h
C src/contrib/sys/dev/ic/athhal_devid.h
C src/contrib/sys/dev/ic/athhal_version.h
U src/contrib/sys/dev/ic/athhal-COPYRIGHT
U src/contrib/sys/dev/ic/athhal-README

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

	cvs checkout -jFreeBSD:yesterday -jFreeBSD src