svn commit: r196322 - in head/sys: dev/cxgb modules/dtrace/dtnfsclient modules/ip6_mroute_mod modules/ipmi/ipmi_linux netinet/ipfw xen

[John Baldwin]

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)