From owner-svn-src-stable@FreeBSD.ORG  Sat Nov 28 14:52:45 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DBE7B1065672;
	Sat, 28 Nov 2009 14:52:45 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B19398FC13;
	Sat, 28 Nov 2009 14:52:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nASEqjtj058120;
	Sat, 28 Nov 2009 14:52:45 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nASEqj6S058119;
	Sat, 28 Nov 2009 14:52:45 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200911281452.nASEqj6S058119@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 28 Nov 2009 14:52:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199879 - stable/6/sys
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Nov 2009 14:52:46 -0000

Author: bz
Date: Sat Nov 28 14:52:45 2009
New Revision: 199879
URL: http://svn.freebsd.org/changeset/base/199879

Log:
  Try to cleanup mergeinfo from r199811.
  I am sure jhb will either be glad or mad at me on Monday;-)

Modified:
Directory Properties:
  stable/6/sys/Makefile   (props changed)
  stable/6/sys/alpha/   (props changed)
  stable/6/sys/amd64/   (props changed)
  stable/6/sys/arm/   (props changed)
  stable/6/sys/boot/   (props changed)
  stable/6/sys/bsm/   (props changed)
  stable/6/sys/cam/   (props changed)
  stable/6/sys/coda/   (props changed)
  stable/6/sys/compat/   (props changed)
  stable/6/sys/contrib/   (props changed)
  stable/6/sys/crypto/   (props changed)
  stable/6/sys/ddb/   (props changed)
  stable/6/sys/dev/   (props changed)
  stable/6/sys/doc/   (props changed)
  stable/6/sys/fs/   (props changed)
  stable/6/sys/gdb/   (props changed)
  stable/6/sys/geom/   (props changed)
  stable/6/sys/gnu/   (props changed)
  stable/6/sys/i386/   (props changed)
  stable/6/sys/i4b/   (props changed)
  stable/6/sys/ia64/   (props changed)
  stable/6/sys/isa/   (props changed)
  stable/6/sys/isofs/   (props changed)
  stable/6/sys/kern/   (props changed)
  stable/6/sys/libkern/   (props changed)
  stable/6/sys/modules/   (props changed)
  stable/6/sys/net/   (props changed)
  stable/6/sys/net80211/   (props changed)
  stable/6/sys/netatalk/   (props changed)
  stable/6/sys/netatm/   (props changed)
  stable/6/sys/netgraph/   (props changed)
  stable/6/sys/netinet/   (props changed)
  stable/6/sys/netinet6/   (props changed)
  stable/6/sys/netipsec/   (props changed)
  stable/6/sys/netipx/   (props changed)
  stable/6/sys/netkey/   (props changed)
  stable/6/sys/netnatm/   (props changed)
  stable/6/sys/netncp/   (props changed)
  stable/6/sys/netsmb/   (props changed)
  stable/6/sys/nfs/   (props changed)
  stable/6/sys/nfs4client/   (props changed)
  stable/6/sys/nfsclient/   (props changed)
  stable/6/sys/nfsserver/   (props changed)
  stable/6/sys/nlm/   (props changed)
  stable/6/sys/opencrypto/   (props changed)
  stable/6/sys/pc98/   (props changed)
  stable/6/sys/pccard/   (props changed)
  stable/6/sys/pci/   (props changed)
  stable/6/sys/posix4/   (props changed)
  stable/6/sys/powerpc/   (props changed)
  stable/6/sys/rpc/   (props changed)
  stable/6/sys/security/   (props changed)
  stable/6/sys/sparc64/   (props changed)
  stable/6/sys/sys/   (props changed)
  stable/6/sys/tools/   (props changed)
  stable/6/sys/ufs/   (props changed)
  stable/6/sys/vm/   (props changed)
  stable/6/sys/xdr/   (props changed)