Subject: CVS commit: src
To: None <source-changes@NetBSD.org>
From: David Young <dyoung@netbsd.org>
List: source-changes
Date: 12/15/2003 03:34:54
Module Name: src
Committed By: dyoung
Date: Mon Dec 15 03:34:54 UTC 2003
Update of /cvsroot/src
In directory ivanova.netbsd.org:/tmp/cvs-serv10288
Log Message:
Import FreeBSD's ath of 12-dec-2003
Vendor Tag: FreeBSD
Release Tags: ath-12-dec-2003
U src/sys/dev/ic/ath.c
U src/sys/dev/ic/athioctl.h
U src/sys/dev/ic/athvar.h
U 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
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
1 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jFreeBSD:yesterday -jFreeBSD src