From owner-p4-projects@FreeBSD.ORG  Thu Nov 10 01:44:26 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B284716A422; Thu, 10 Nov 2005 01:44:25 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 7C96F16A41F
	for <perforce@freebsd.org>; Thu, 10 Nov 2005 01:44:25 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2C88B43D48
	for <perforce@freebsd.org>; Thu, 10 Nov 2005 01:44:25 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAA1iPML029418
	for <perforce@freebsd.org>; Thu, 10 Nov 2005 01:44:25 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAA1iOa6029415
	for perforce@freebsd.org; Thu, 10 Nov 2005 01:44:24 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 10 Nov 2005 01:44:24 GMT
Message-Id: <200511100144.jAA1iOa6029415@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>
Cc: 
Subject: PERFORCE change 86565 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: Thu, 10 Nov 2005 01:44:26 -0000

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

Change 86565 by peter@peter_daintree on 2005/11/10 01:44:13

	Integrate -b i386_hammer (but leave out the XBOX stuff)

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#146 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#84 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#86 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#48 integrate
.. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#23 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#146 (text+ko) ====


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


==== //depot/projects/hammer/sys/amd64/conf/NOTES#86 (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.1210)
+# (XXX from i386:NOTES,v 1.1211)
 # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.47 2005/10/31 20:45:37 jhb Exp $
 #
 

==== //depot/projects/hammer/sys/amd64/isa/clock.c#48 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#23 (text+ko) ====