From owner-p4-projects@FreeBSD.ORG  Sat Aug 20 03:58:29 2005
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 04E5A16A421; Sat, 20 Aug 2005 03:58:29 +0000 (GMT)
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 D32EA16A41F
	for <perforce@freebsd.org>; Sat, 20 Aug 2005 03:58:28 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9EE5C43D45
	for <perforce@freebsd.org>; Sat, 20 Aug 2005 03:58:28 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7K3wSGG095574
	for <perforce@freebsd.org>; Sat, 20 Aug 2005 03:58:28 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7K3wSsR095571
	for perforce@freebsd.org; Sat, 20 Aug 2005 03:58:28 GMT
	(envelope-from scottl@freebsd.org)
Date: Sat, 20 Aug 2005 03:58:28 GMT
Message-Id: <200508200358.j7K3wSsR095571@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 82305 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: Sat, 20 Aug 2005 03:58:29 -0000

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

Change 82305 by scottl@scottl-junior on 2005/08/20 03:58:10

	Fix some more accidental diffs

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/dcons/Makefile#4 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#5 (text+ko) ====

@@ -25,8 +25,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from BSDI $Id: //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#2 $
- *	and BSDI $Id: //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#2 $
+ *	from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $
+ *	and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $
  */
 
 /*

==== //depot/projects/scottl-camlock/src/sys/modules/dcons/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $Id: //depot/projects/scottl-camlock/src/sys/modules/dcons/Makefile#1 $
+# $Id: Makefile,v 1.6 2003/10/24 15:41:26 simokawa Exp $
 # $FreeBSD: src/sys/modules/dcons/Makefile,v 1.3 2004/10/13 05:41:09 simokawa Exp $
 
 .PATH:	${.CURDIR}/../../dev/dcons