PERFORCE change 82305 for review

[Scott Long]

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

Change 82305 by scottl at 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