From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 18:19:18 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 19D9E16A4E1; Tue, 15 Aug 2006 18:19:18 +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 C7CE716A4DA
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 18:19:17 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E961E43D76
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 18:19:11 +0000 (GMT)
	(envelope-from jhb@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 k7FIJBWO040230
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 18:19:11 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIJBXf040227
	for perforce@freebsd.org; Tue, 15 Aug 2006 18:19:11 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 15 Aug 2006 18:19:11 GMT
Message-Id: <200608151819.k7FIJBXf040227@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 104084 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: Tue, 15 Aug 2006 18:19:18 -0000

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

Change 104084 by jhb@jhb_mutex on 2006/08/15 18:18:33

	Mismerge.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_lock.c#53 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_lock.c#53 (text+ko) ====

@@ -45,8 +45,6 @@
 
 #include "opt_ddb.h"
 
-#include "opt_ddb.h"
-
 #include <sys/param.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>