From owner-p4-projects@FreeBSD.ORG  Sun Aug 26 10:43:04 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 85516106574E; Sun, 26 Aug 2012 10:43:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 33F4A106574C
	for <perforce@freebsd.org>; Sun, 26 Aug 2012 10:43:02 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 1BAF28FC08
	for <perforce@freebsd.org>; Sun, 26 Aug 2012 10:43:02 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7QAh1JY041664
	for <perforce@freebsd.org>; Sun, 26 Aug 2012 10:43:01 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7QAh1ik041661
	for perforce@freebsd.org; Sun, 26 Aug 2012 10:43:01 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 26 Aug 2012 10:43:01 GMT
Message-Id: <201208261043.q7QAh1ik041661@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 216526 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 26 Aug 2012 10:43:04 -0000

http://p4web.freebsd.org/@@216526?ac=10

Change 216526 by rwatson@rwatson_cinnamon on 2012/08/26 10:41:58

	Manually merge downstream some cosmetic changes to BERI_DE4.hints
	introduced during the upstream merge of these changes to FreeBSD
	Subversion.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#14 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#14 (text+ko) ====

@@ -2,7 +2,7 @@
 
 #
 # Altera JTAG UARTs configured for console, debugging, and data putput on the
-# DE-4.
+# Terasic DE-4.
 #
 hint.altera_jtag_uart.0.at="nexus0"
 hint.altera_jtag_uart.0.maddr=0x7f000000
@@ -51,7 +51,7 @@
 hint.terasic_mtl.0.text_msize=0x2000
 
 #
-# BERI Hardware Version Rom
+# BERI Hardware Version ROM
 #
 hint.altera_avgen.0.at="nexus0"
 hint.altera_avgen.0.maddr=0x7F00A000