From owner-cvs-src-old@FreeBSD.ORG  Sun Jul 11 05:13:56 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 F22341065674
	for <cvs-src-old@freebsd.org>; Sun, 11 Jul 2010 05:13:56 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DECBB8FC1C
	for <cvs-src-old@freebsd.org>; Sun, 11 Jul 2010 05:13:56 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6B5DuAI080050
	for <cvs-src-old@freebsd.org>; Sun, 11 Jul 2010 05:13:56 GMT
	(envelope-from nwhitehorn@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6B5DuEV080049
	for cvs-src-old@freebsd.org; Sun, 11 Jul 2010 05:13:56 GMT
	(envelope-from nwhitehorn@repoman.freebsd.org)
Message-Id: <201007110513.o6B5DuEV080049@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	nwhitehorn@repoman.freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 11 Jul 2010 05:13:38 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/lib/libthr/arch/powerpc64/include pthread_md.h
 src/lib/libthr/arch/powerpc64/powerpc
 pthread_md.c src/lib/libthr/arch/powerpc64/powerpc64 pthread_md.c
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: Sun, 11 Jul 2010 05:13:57 -0000

nwhitehorn    2010-07-11 05:13:38 UTC

  FreeBSD src repository

  Modified files:
    lib/libthr/arch/powerpc64/include pthread_md.h 
  Added files:
    lib/libthr/arch/powerpc64/powerpc64 pthread_md.c 
  Removed files:
    lib/libthr/arch/powerpc64/powerpc pthread_md.c 
  Log:
  SVN rev 209893 on 2010-07-11 05:13:38Z by nwhitehorn
  
  Fix SVN mismerge. We somehow ended up with the 32-bit powerpc version
  in arch/powerpc64 instead of the 64-bit one.
  
  Revision  Changes    Path
  1.2       +4 -4      src/lib/libthr/arch/powerpc64/include/pthread_md.h
  1.2       +0 -54     src/lib/libthr/arch/powerpc64/powerpc/pthread_md.c (dead)
  1.1       +54 -0     src/lib/libthr/arch/powerpc64/powerpc64/pthread_md.c (new)