From owner-p4-projects@FreeBSD.ORG  Sun Mar  7 18:04:03 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A386516A4D0; Sun,  7 Mar 2004 18:04:03 -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 7E93C16A4CE
	for <perforce@freebsd.org>; Sun,  7 Mar 2004 18:04:03 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 620DB43D1F
	for <perforce@freebsd.org>; Sun,  7 Mar 2004 18:04:03 -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 i28243Ge070869
	for <perforce@freebsd.org>; Sun, 7 Mar 2004 18:04:03 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i28242pT070866
	for perforce@freebsd.org; Sun, 7 Mar 2004 18:04:02 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Sun, 7 Mar 2004 18:04:02 -0800 (PST)
Message-Id: <200403080204.i28242pT070866@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 48395 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, 08 Mar 2004 02:04:04 -0000

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

Change 48395 by peter@peter_overcee on 2004/03/07 18:04:00

	go go gadget indirect branch merge (-I -b i386_hammer)

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#58 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#29 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#58 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#29 (text+ko) ====