From owner-p4-projects@FreeBSD.ORG  Fri May  9 11:30:02 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 49F8B37B404; Fri,  9 May 2003 11:30:02 -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 7FD9637B401
	for <perforce@freebsd.org>; Fri,  9 May 2003 11:30:00 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1EB3D43F3F
	for <perforce@freebsd.org>; Fri,  9 May 2003 11:30:00 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49ITx0U078244
	for <perforce@freebsd.org>; Fri, 9 May 2003 11:29:59 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49ITxFo078241
	for perforce@freebsd.org; Fri, 9 May 2003 11:29:59 -0700 (PDT)
Date: Fri, 9 May 2003 11:29:59 -0700 (PDT)
Message-Id: <200305091829.h49ITxFo078241@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 30861 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: Fri, 09 May 2003 18:30:03 -0000

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

Change 30861 by peter@peter_daintree on 2003/05/09 11:29:56

	IFC @30860

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/GENERIC#7 integrate
.. //depot/projects/hammer/sys/amd64/include/npx.h#7 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#8 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#7 (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.383 2003/05/01 01:05:22 peter Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.384 2003/05/09 18:26:06 peter Exp $
 
 machine		amd64
 cpu		HAMMER

==== //depot/projects/hammer/sys/amd64/include/npx.h#7 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD: src/sys/amd64/include/npx.h,v 1.27 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/npx.h,v 1.28 2003/05/09 18:28:05 peter Exp $
  */
 
 /*

==== //depot/projects/hammer/sys/dev/syscons/syscons.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.401 2003/03/25 00:07:01 jake Exp $
+ * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.402 2003/05/09 18:24:40 peter Exp $
  */
 
 #include "opt_syscons.h"