svn commit: r206096 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci net

[Bjoern A. Zeeb]

Author: bz
Date: Fri Apr  2 14:37:55 2010
New Revision: 206096
URL: http://svn.freebsd.org/changeset/base/206096

Log:
  Propagate merge-info from sys/net to sys for r206024.
  Also record mergeinfo for r206042.

Modified:
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/net/   (props changed)