Author: jhb Date: Thu Sep 10 16:03:11 2009 New Revision: 197069 URL: http://svn.freebsd.org/changeset/base/197069 Log: Hoist some mergeinfo up from sys/net to sys/. Reported by: kib Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/net/ (props changed)