From owner-p4-projects@FreeBSD.ORG  Mon May 17 14:34:15 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B125916A4D2; Mon, 17 May 2004 14:34:14 -0700 (PDT)
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 8336116A4D0
	for <perforce@freebsd.org>; Mon, 17 May 2004 14:34:14 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 01E2543D3F
	for <perforce@freebsd.org>; Mon, 17 May 2004 14:34:14 -0700 (PDT)
	(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 i4HLYDGe076646
	for <perforce@freebsd.org>; Mon, 17 May 2004 14:34:13 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4HLYDNi076643
	for perforce@freebsd.org; Mon, 17 May 2004 14:34:13 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Mon, 17 May 2004 14:34:13 -0700 (PDT)
Message-Id: <200405172134.i4HLYDNi076643@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 52954 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, 17 May 2004 21:34:15 -0000

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

Change 52954 by peter@peter_daintree on 2004/05/17 14:33:44

	integ -I -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#27 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#31 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#27 (text+ko) ====


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

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# (XXX from i386:NOTES,v 1.1158)
+# (XXX from i386:NOTES,v 1.1160)
 # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.13 2004/05/16 21:27:29 peter Exp $
 #