From owner-cvs-all@FreeBSD.ORG  Fri Oct 31 19:35:31 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id F2BE116A4CE; Fri, 31 Oct 2003 19:35:30 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3EF4343F75; Fri, 31 Oct 2003 19:35:30 -0800 (PST)
	(envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA13ZTXJ071589;
	Fri, 31 Oct 2003 19:35:29 -0800 (PST)
	(envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA13ZTIv071588;
	Fri, 31 Oct 2003 19:35:29 -0800 (PST)
	(envelope-from sam)
Message-Id: <200311010335.hA13ZTIv071588@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 31 Oct 2003 19:35:29 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/contrib/dev/ath/freebsd i386-elf.hal.o.uu
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Nov 2003 03:35:31 -0000

sam         2003/10/31 19:35:29 PST

  FreeBSD src repository

  Modified files:
    sys/contrib/dev/ath/freebsd i386-elf.hal.o.uu 
  Log:
  resolve merge conflict
  
  Revision  Changes      Path
  1.4       +3216 -3230  src/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu