From owner-svn-src-head@FreeBSD.ORG  Mon Aug 17 14:38:59 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CC8C71065696;
	Mon, 17 Aug 2009 14:38:59 +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 BAEBD8FC55;
	Mon, 17 Aug 2009 14:38:59 +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 n7HEcxwg080552;
	Mon, 17 Aug 2009 14:38:59 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7HEcxLr080551;
	Mon, 17 Aug 2009 14:38:59 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200908171438.n7HEcxLr080551@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 17 Aug 2009 14:38:59 +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: r196322 - in head/sys: dev/cxgb
	modules/dtrace/dtnfsclient modules/ip6_mroute_mod
	modules/ipmi/ipmi_linux netinet/ipfw xen
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Aug 2009 14:38:59 -0000

Author: jhb
Date: Mon Aug 17 14:38:59 2009
New Revision: 196322
URL: http://svn.freebsd.org/changeset/base/196322

Log:
  Purge mergeinfo in sys/ that is either empty or a subset of the parent
  mergeinfo on sys/ itself.
  
  Approved by:	re (mergeinfo blanket)

Modified:
  head/sys/dev/cxgb/   (props changed)
  head/sys/modules/dtrace/dtnfsclient/   (props changed)
  head/sys/modules/ip6_mroute_mod/   (props changed)
  head/sys/modules/ipmi/ipmi_linux/   (props changed)
  head/sys/netinet/ipfw/ip_dummynet.c   (props changed)
  head/sys/netinet/ipfw/ip_fw2.c   (props changed)
  head/sys/netinet/ipfw/ip_fw_nat.c   (props changed)
  head/sys/netinet/ipfw/ip_fw_pfil.c   (props changed)
  head/sys/xen/evtchn.h   (props changed)
  head/sys/xen/hypervisor.h   (props changed)
  head/sys/xen/xen_intr.h   (props changed)