From owner-p4-projects@FreeBSD.ORG  Sat Mar 13 14:50:08 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F5B216A4D0; Sat, 13 Mar 2004 14:50:08 -0800 (PST)
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 5798D16A4CE
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 14:50:08 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 39A1A43D1D
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 14:50:08 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DMo8Ge070409
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 14:50:08 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DMo7a9070406
	for perforce@freebsd.org; Sat, 13 Mar 2004 14:50:07 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Sat, 13 Mar 2004 14:50:07 -0800 (PST)
Message-Id: <200403132250.i2DMo7a9070406@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 48921 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: Sat, 13 Mar 2004 22:50:08 -0000

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

Change 48921 by peter@peter_overcee on 2004/03/13 14:49:12

	fix mis-merge

Affected files ...

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

Differences ...

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

@@ -5,7 +5,7 @@
 # machine independent notes, look in /sys/conf/NOTES.
 #
 # (XXX from i386:NOTES,v 1.1136)
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $
 #
 
 # We don't have modules on amd64.