From owner-svn-src-all@FreeBSD.ORG  Tue Jun 16 17:48:08 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0887106564A;
	Tue, 16 Jun 2009 17:48:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ACE088FC16;
	Tue, 16 Jun 2009 17:48:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5GHm8AM035149;
	Tue, 16 Jun 2009 17:48:08 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5GHm8lE035148;
	Tue, 16 Jun 2009 17:48:08 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200906161748.n5GHm8lE035148@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 16 Jun 2009 17:48:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194300 - in head/sys/cddl/contrib/opensolaris:
	common/atomic/amd64 common/atomic/i386 common/atomic/ia64
	common/atomic/sparc64 uts/common/rpc uts/common/zmod
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jun 2009 17:48:09 -0000

Author: jhb
Date: Tue Jun 16 17:48:08 2009
New Revision: 194300
URL: http://svn.freebsd.org/changeset/base/194300

Log:
  Remove confusing mergeinfo caused by renaming files.

Modified:
  head/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S   (props changed)
  head/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S   (props changed)
  head/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S   (props changed)
  head/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S   (props changed)
  head/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c   (props changed)
  head/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c   (props changed)
  head/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c   (props changed)
  head/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c   (props changed)