Subject: CVS commit: src
To: None <source-changes@NetBSD.org>
From: David Young <dyoung@netbsd.org>
List: source-changes
Date: 06/21/2005 20:38:43
Module Name:	src
Committed By:	dyoung
Date:		Tue Jun 21 20:38:43 UTC 2005

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

Log Message:
Import FreeBSD's ath(4) of 2005-05-18


Vendor Tag:	FreeBSD
Release Tags:	ath-2005-05-18
		
N src/sys/dev/ic/athrate-amrr.c
N src/sys/dev/ic/athrate-amrr.h
N src/sys/dev/ic/athrate-onoe.c
N src/sys/dev/ic/athrate-onoe.h
N src/sys/dev/ic/athrate-sample.c
N src/sys/dev/ic/athrate-sample.h
C src/sys/dev/ic/ath.c
C src/sys/dev/ic/athioctl.h
N src/sys/dev/ic/athrate.h
C src/sys/dev/ic/athvar.h
C src/sys/dev/pci/if_ath_pci.c
N src/sys/contrib/dev/ic/athhal_osdep.c
N src/sys/contrib/dev/ic/athhal_osdep.h
N src/sys/contrib/dev/ic/athhal_if.m
N src/sys/contrib/dev/ic/athhal.h
N src/sys/contrib/dev/ic/athhal_desc.h
N src/sys/contrib/dev/ic/athhal_devid.h
N src/sys/contrib/dev/ic/athhal_version.h
N src/sys/contrib/dev/ic/athhal-COPYRIGHT
N src/sys/contrib/dev/ic/athhal-README
N src/sys/contrib/arch/amd64/dev/athhal-x86_64-elf.hal.o.uue
N src/sys/contrib/arch/amd64/dev/athhal-x86_64-elf.inc
N src/sys/contrib/arch/amd64/dev/athhal-x86_64-elf.opt_ah.h
N src/sys/contrib/arch/arm/dev/athhal-arm9-le-thumb-elf.hal.o.uue
N src/sys/contrib/arch/arm/dev/athhal-arm9-le-thumb-elf.inc
N src/sys/contrib/arch/arm/dev/athhal-arm9-le-thumb-elf.opt_ah.h
N src/sys/contrib/arch/arm/dev/athhal-armv4-be-elf.hal.o.uue
N src/sys/contrib/arch/arm/dev/athhal-armv4-be-elf.inc
N src/sys/contrib/arch/arm/dev/athhal-armv4-be-elf.opt_ah.h
N src/sys/contrib/arch/arm/dev/athhal-armv4-le-elf.hal.o.uue
N src/sys/contrib/arch/arm/dev/athhal-armv4-le-elf.inc
N src/sys/contrib/arch/arm/dev/athhal-armv4-le-elf.opt_ah.h
N src/sys/contrib/arch/arm/dev/athhal-xscale-be-elf.hal.o.uue
N src/sys/contrib/arch/arm/dev/athhal-xscale-be-elf.inc
N src/sys/contrib/arch/arm/dev/athhal-xscale-be-elf.opt_ah.h
N src/sys/contrib/arch/arm/dev/athhal-xscale-le-elf.hal.o.uue
N src/sys/contrib/arch/arm/dev/athhal-xscale-le-elf.inc
N src/sys/contrib/arch/arm/dev/athhal-xscale-le-elf.opt_ah.h
N src/sys/contrib/arch/i386/dev/athhal-i386-elf.hal.o.uue
N src/sys/contrib/arch/i386/dev/athhal-i386-elf.inc
N src/sys/contrib/arch/i386/dev/athhal-i386-elf.opt_ah.h
N src/sys/contrib/arch/mips/dev/athhal-mips-be-elf.hal.o.uue
N src/sys/contrib/arch/mips/dev/athhal-mips-be-elf.inc
N src/sys/contrib/arch/mips/dev/athhal-mips-be-elf.opt_ah.h
N src/sys/contrib/arch/mips/dev/athhal-mips-le-elf.hal.o.uue
N src/sys/contrib/arch/mips/dev/athhal-mips-le-elf.inc
N src/sys/contrib/arch/mips/dev/athhal-mips-le-elf.opt_ah.h
N src/sys/contrib/arch/mips/dev/athhal-mips1-be-elf.hal.o.uue
N src/sys/contrib/arch/mips/dev/athhal-mips1-be-elf.inc
N src/sys/contrib/arch/mips/dev/athhal-mips1-be-elf.opt_ah.h
N src/sys/contrib/arch/mips/dev/athhal-mips1-le-elf.hal.o.uue
N src/sys/contrib/arch/mips/dev/athhal-mips1-le-elf.inc
N src/sys/contrib/arch/mips/dev/athhal-mips1-le-elf.opt_ah.h
N src/sys/contrib/arch/mips/dev/athhal-mipsisa32-be-elf.inc
N src/sys/contrib/arch/mips/dev/athhal-mipsisa32-be-elf.hal.o.uue
N src/sys/contrib/arch/mips/dev/athhal-mipsisa32-be-elf.opt_ah.h
N src/sys/contrib/arch/mips/dev/athhal-mipsisa32-le-elf.hal.o.uue
N src/sys/contrib/arch/mips/dev/athhal-mipsisa32-le-elf.inc
N src/sys/contrib/arch/mips/dev/athhal-mipsisa32-le-elf.opt_ah.h
N src/sys/contrib/arch/powerpc/dev/athhal-powerpc-be-eabi.hal.o.uue
N src/sys/contrib/arch/powerpc/dev/athhal-powerpc-be-eabi.inc
N src/sys/contrib/arch/powerpc/dev/athhal-powerpc-be-eabi.opt_ah.h
N src/sys/contrib/arch/powerpc/dev/athhal-powerpc-le-eabi.hal.o.uue
N src/sys/contrib/arch/powerpc/dev/athhal-powerpc-le-eabi.inc
N src/sys/contrib/arch/powerpc/dev/athhal-powerpc-le-eabi.opt_ah.h
N src/sys/contrib/arch/sh3/dev/athhal-sh4-le-elf.hal.o.uue
N src/sys/contrib/arch/sh3/dev/athhal-sh4-le-elf.inc
N src/sys/contrib/arch/sh3/dev/athhal-sh4-le-elf.opt_ah.h

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

	cvs checkout -jFreeBSD:yesterday -jFreeBSD src