From owner-p4-projects@FreeBSD.ORG  Thu Jul  6 23:18:57 2006
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 CC3C216A4E0; Thu,  6 Jul 2006 23:18:57 +0000 (UTC)
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 90BA016A4DE
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 23:18:57 +0000 (UTC)
	(envelope-from bms@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4F6A543D46
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 23:18:57 +0000 (GMT)
	(envelope-from bms@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66NIvIh059278
	for <perforce@freebsd.org>; Thu, 6 Jul 2006 23:18:57 GMT
	(envelope-from bms@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66NIvHh059275
	for perforce@freebsd.org; Thu, 6 Jul 2006 23:18:57 GMT
	(envelope-from bms@freebsd.org)
Date: Thu, 6 Jul 2006 23:18:57 GMT
Message-Id: <200607062318.k66NIvHh059275@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bms@freebsd.org using -f
From: Bruce M Simpson <bms@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100819 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, 06 Jul 2006 23:18:58 -0000

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

Change 100819 by bms@bms_montagne on 2006/07/06 23:17:58

	typo

Affected files ...

.. //depot/projects/mips2/src/sys/mips/include/cpufunc.h#7 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/include/cpufunc.h#7 (text+ko) ====

@@ -36,7 +36,6 @@
 static __inline void
 mips_barrier(void)
 {
-<<<<<<< yours
 	__asm __volatile (".set noreorder\n\t"
 			  "nop\n\t"
 			  "nop\n\t"