From owner-p4-projects@FreeBSD.ORG  Mon Aug 30 22:45:06 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 156E116A4D0; Mon, 30 Aug 2004 22:45:06 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DEF3816A4CE
	for <perforce@freebsd.org>; Mon, 30 Aug 2004 22:45:05 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C091A43D49
	for <perforce@freebsd.org>; Mon, 30 Aug 2004 22:45:05 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7UMj5YP031360
	for <perforce@freebsd.org>; Mon, 30 Aug 2004 22:45:05 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7UMj5gr031357
	for perforce@freebsd.org; Mon, 30 Aug 2004 22:45:05 GMT
	(envelope-from peter@freebsd.org)
Date: Mon, 30 Aug 2004 22:45:05 GMT
Message-Id: <200408302245.i7UMj5gr031357@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 60729 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 30 Aug 2004 22:45:06 -0000

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

Change 60729 by peter@peter_daintree on 2004/08/30 22:44:21

	fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/NOTES#45 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/NOTES#45 (text+ko) ====

@@ -5,7 +5,7 @@
 # machine independent notes, look in /sys/conf/NOTES.
 #
 # (XXX from i386:NOTES,v 1.1170)
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.18 2004/08/16 12:39:27 tjr Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.19 2004/08/27 21:29:20 arved Exp $
 #
 
 #