From owner-p4-projects@FreeBSD.ORG  Thu Jun  3 14:49:51 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5CA6D16A4D0; Thu,  3 Jun 2004 14:49:51 -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 1DDD116A4CE
	for <perforce@freebsd.org>; Thu,  3 Jun 2004 14:49:51 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E043543D41
	for <perforce@freebsd.org>; Thu,  3 Jun 2004 14:49:50 -0700 (PDT)
	(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 i53Lno6A034992
	for <perforce@freebsd.org>; Thu, 3 Jun 2004 14:49:50 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53Lnocb034989
	for perforce@freebsd.org; Thu, 3 Jun 2004 14:49:50 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Thu, 3 Jun 2004 14:49:50 -0700 (PDT)
Message-Id: <200406032149.i53Lnocb034989@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 54113 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: Thu, 03 Jun 2004 21:49:52 -0000

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

Change 54113 by peter@peter_daintree on 2004/06/03 14:49:01

	IFC @54112

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/GENERIC#43 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#43 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.409 2004/05/17 22:13:14 peter Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.410 2004/06/03 21:40:41 peter Exp $
 
 machine		amd64
 cpu		HAMMER