From owner-p4-projects@FreeBSD.ORG  Sun May 16 13:42:46 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B288616A4D1; Sun, 16 May 2004 13:42:45 -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 5852F16A4CF
	for <perforce@freebsd.org>; Sun, 16 May 2004 13:42:45 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9508243D5F
	for <perforce@freebsd.org>; Sun, 16 May 2004 13:42:43 -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 i4GKghGe008707
	for <perforce@freebsd.org>; Sun, 16 May 2004 13:42:43 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4GKghQ8008700
	for perforce@freebsd.org; Sun, 16 May 2004 13:42:43 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Sun, 16 May 2004 13:42:43 -0700 (PDT)
Message-Id: <200405162042.i4GKghQ8008700@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 52874 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: Sun, 16 May 2004 20:42:46 -0000

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

Change 52874 by peter@peter_overcee on 2004/05/16 13:41:49

	Can't remove clause-3 here because dyson has a mention in the
	header.  I dont know if bsdimp has dyson's ok to remove these
	or not, but it was removed on i386.

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/vmparam.h#20 edit

Differences ...

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

@@ -17,6 +17,10 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.