From owner-cvs-src@FreeBSD.ORG  Sat Mar 11 01:26:19 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1633F16A41F;
	Sat, 11 Mar 2006 01:26:19 +0000 (GMT) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1761C4B194;
	Fri, 10 Mar 2006 22:18:18 +0000 (GMT) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2AMI7it036345;
	Fri, 10 Mar 2006 22:18:07 GMT (envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2AMI2tL036340;
	Fri, 10 Mar 2006 22:18:02 GMT (envelope-from sam)
Message-Id: <200603102218.k2AMI2tL036340@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 10 Mar 2006 22:17:57 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/dev/ath if_ath.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Mar 2006 01:26:19 -0000

sam         2006-03-10 22:17:57 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/dev/ath          if_ath.c 
  Log:
  fix harmless merge botches
  
  Approved by:    re
  
  Revision   Changes    Path
  1.94.2.15  +1 -2      src/sys/dev/ath/if_ath.c