From owner-p4-projects@FreeBSD.ORG  Tue Sep 22 22:29:02 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 877E91065696; Tue, 22 Sep 2009 22:29:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4BE86106568B
	for <perforce@freebsd.org>; Tue, 22 Sep 2009 22:29:02 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3BE798FC1A
	for <perforce@freebsd.org>; Tue, 22 Sep 2009 22:29:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8MMT2U2018664
	for <perforce@freebsd.org>; Tue, 22 Sep 2009 22:29:02 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MMT2vH018662
	for perforce@freebsd.org; Tue, 22 Sep 2009 22:29:02 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 22 Sep 2009 22:29:02 GMT
Message-Id: <200909222229.n8MMT2vH018662@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 168800 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Sep 2009 22:29:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=168800

Change 168800 by mav@mav_mavbook on 2009/09/22 22:28:20

	Fix missed conflict resolve.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#22 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#22 (text+ko) ====

@@ -24,13 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ahci/ahci.h#1
- * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.1 2009/07/10 08:18:08 scottl Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/ahci/ahci.h#2
  * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.2 2009/08/30 15:20:13 mav Exp $
-==== YOURS //mav_mavbook/scottl-camlock/src/sys/dev/ahci/ahci.h
- * $FreeBSD$
-<<<<
  */
 
 /* ATA register defines */