From owner-cvs-src-old@FreeBSD.ORG  Mon Aug  2 17:31:59 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8097F1065758
	for <cvs-src-old@freebsd.org>; Mon,  2 Aug 2010 17:31:59 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 539DA8FC20
	for <cvs-src-old@freebsd.org>; Mon,  2 Aug 2010 17:31:59 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o72HVxmF024915
	for <cvs-src-old@freebsd.org>; Mon, 2 Aug 2010 17:31:59 GMT
	(envelope-from rpaulo@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o72HVxPJ024914
	for cvs-src-old@freebsd.org; Mon, 2 Aug 2010 17:31:59 GMT
	(envelope-from rpaulo@repoman.freebsd.org)
Message-Id: <201008021731.o72HVxPJ024914@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rpaulo@repoman.freebsd.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 2 Aug 2010 17:31:48 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/cddl/contrib/opensolaris/lib/libdtrace/common
	dt_impl.h
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Aug 2010 17:31:59 -0000

rpaulo      2010-08-02 17:31:48 UTC

  FreeBSD src repository

  Modified files:
    cddl/contrib/opensolaris/lib/libdtrace/common dt_impl.h 
  Log:
  SVN rev 210776 on 2010-08-02 17:31:48Z by rpaulo
  
  Fix another mismerge: bring back the definition of DT_MUTEX_HELD().
  
  Revision  Changes    Path
  1.5       +8 -0      src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h