From owner-cvs-src@FreeBSD.ORG  Fri Nov 28 18:11:56 2003
Return-Path: <owner-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 EEBBE16A4CE; Fri, 28 Nov 2003 18:11:56 -0800 (PST)
Received: from ebb.errno.com (ebb.errno.com [66.127.85.87])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8B1AC43FD7; Fri, 28 Nov 2003 18:11:55 -0800 (PST)
	(envelope-from sam@errno.com)
Received: from 66.127.85.91 ([66.127.85.91])
	(authenticated bits=0)
	by ebb.errno.com (8.12.9/8.12.9) with ESMTP id hAT2BrHQ084255
	(version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO);
	Fri, 28 Nov 2003 18:11:54 -0800 (PST)
	(envelope-from sam@errno.com)
From: Sam Leffler <sam@errno.com>
Organization: Errno Consulting
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
Date: Fri, 28 Nov 2003 18:14:37 -0800
User-Agent: KMail/1.5.3
References: <200311290111.hAT1BnTB064982@repoman.freebsd.org>
In-Reply-To: <200311290111.hAT1BnTB064982@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200311281814.37811.sam@errno.com>
Subject: Re: cvs commit: src/sys/contrib/dev/ath - Imported sources
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
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, 29 Nov 2003 02:11:57 -0000

On Friday 28 November 2003 05:11 pm, Sam Leffler wrote:

>   1 conflicts created by this import.
>   Use the following command to help the merge:
>
>   	cvs checkout -jATHEROS:yesterday -jATHEROS src/sys/contrib/dev/ath

For those that care, this was resolved by some repo magic.  The conflict was 
due to a versioning problem that occurred when I initially committed this 
stuff.

	Sam