From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 17 11:21:27 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 3D345106566C;
	Wed, 17 Jun 2009 11:21:27 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 104658FC0C;
	Wed, 17 Jun 2009 11:21:27 +0000 (UTC) (envelope-from des@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 n5HBLPdD073542;
	Wed, 17 Jun 2009 11:21:25 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5HBLPwR073541;
	Wed, 17 Jun 2009 11:21:25 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200906171121.n5HBLPwR073541@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 17 Jun 2009 11:21:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194347 - in stable/7/sys: . contrib/pf
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: Wed, 17 Jun 2009 11:21:27 -0000

Author: des
Date: Wed Jun 17 11:21:25 2009
New Revision: 194347
URL: http://svn.freebsd.org/changeset/base/194347

Log:
  Nuke incorrect mergeinfo:
  
  /head:r189748
  /head/sys/net:r182880
  
  The correct mergeinfo for these revisions was already present.
  
  Pointy hat to:	emax, rpaulo

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)