svn commit: r199973 - in stable/6/sys: . conf contrib/pf dev/cxgb

[John Baldwin]

Author: jhb
Date: Mon Nov 30 21:00:42 2009
New Revision: 199973
URL: http://svn.freebsd.org/changeset/base/199973

Log:
  Fixup mergeinfo and move sys/conf mergeinfo up to sys/.

Modified:
Directory Properties:
  stable/6/sys/   (props changed)
  stable/6/sys/conf/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)