CVS commit: src

[David Young <dyoung%netbsd.org@localhost>]

Module Name:    src
Committed By:   dyoung
Date:           Thu Apr 29 03:54:47 UTC 2004

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

Log Message:
Import FreeBSD's ath of 28-apr-2004

Status:

Vendor Tag:     FreeBSD
Release Tags:   ath-28-apr-2004
                
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/arch/i386/dev/athhal-elf-o.uue
U src/contrib/sys/dev/ic/athhal_osdep.c
U src/contrib/sys/dev/ic/athhal_osdep.h
U src/contrib/sys/dev/ic/athhal_if.m
U src/contrib/sys/dev/ic/athhal.h
U src/contrib/sys/dev/ic/athhal_desc.h
U src/contrib/sys/dev/ic/athhal_devid.h
U src/contrib/sys/dev/ic/athhal_version.h
U src/contrib/sys/dev/ic/athhal-COPYRIGHT
U src/contrib/sys/dev/ic/athhal-README

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

        cvs checkout -jFreeBSD:yesterday -jFreeBSD src