Sam Leffler 1be92ea1ca resolve merge conflicts ... MFC after: 2 weeks		2006-02-10 19:01:02 +00:00
..
altq/altq	Propagate rename of IFF_OACTIVE and IFF_RUNNING to IFF_DRV_OACTIVE and	2005-08-09 10:20:02 +00:00
dev	resolve merge conflicts	2006-02-10 19:01:02 +00:00
ia64/libuwx
ipfilter/netinet	Add mcopywrap prototype to ip_compat.h	2005-12-30 11:55:37 +00:00
ngatm	This commit was generated by cvs2svn to compensate for changes in r146539,	2005-05-23 13:08:32 +00:00
pf	Make pflog a seperate module. As a result pflog_packet() becomes a function	2006-02-05 17:17:32 +00:00