Index: stable/8/sys/amd64/include/xen
===================================================================
--- stable/8/sys/amd64/include/xen	(revision 220351)
+++ stable/8/sys/amd64/include/xen	(revision 220352)

Property changes on: stable/8/sys/amd64/include/xen
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/amd64/include/xen:r220124
Index: stable/8/sys/cddl/contrib/opensolaris
===================================================================
--- stable/8/sys/cddl/contrib/opensolaris	(revision 220351)
+++ stable/8/sys/cddl/contrib/opensolaris	(revision 220352)

Property changes on: stable/8/sys/cddl/contrib/opensolaris
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/cddl/contrib/opensolaris:r220124
Index: stable/8/sys/contrib/dev/acpica
===================================================================
--- stable/8/sys/contrib/dev/acpica	(revision 220351)
+++ stable/8/sys/contrib/dev/acpica	(revision 220352)

Property changes on: stable/8/sys/contrib/dev/acpica
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/dev/acpica:r220124
Index: stable/8/sys/contrib/pf
===================================================================
--- stable/8/sys/contrib/pf	(revision 220351)
+++ stable/8/sys/contrib/pf	(revision 220352)

Property changes on: stable/8/sys/contrib/pf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/pf:r220124
Index: stable/8/sys/modules/ipfw/Makefile
===================================================================
--- stable/8/sys/modules/ipfw/Makefile	(revision 220351)
+++ stable/8/sys/modules/ipfw/Makefile	(revision 220352)
@@ -1,31 +1,31 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 .PATH: ${.CURDIR}/../../netinet/ipfw
 
 KMOD=	ipfw
 SRCS=	ip_fw2.c ip_fw_pfil.c
-SRCS+=	ip_fw_dynamic.c ip_fw_log.c ip_fw_nat.c
+SRCS+=	ip_fw_dynamic.c ip_fw_log.c
 SRCS+=	ip_fw_sockopt.c ip_fw_table.c
 SRCS+=	opt_inet6.h opt_ipsec.h
 
 CFLAGS+= -DIPFIREWALL
 CFLAGS+= -I${.CURDIR}/../../contrib/pf
 #
 #If you want it verbose
 #CFLAGS+= -DIPFIREWALL_VERBOSE
 #CFLAGS+= -DIPFIREWALL_VERBOSE_LIMIT=100
 #
 #If you want it to pass all packets by default
 #CFLAGS+= -DIPFIREWALL_DEFAULT_TO_ACCEPT
 #
 
 .if !defined(KERNBUILDDIR)
 .if ${MK_INET6_SUPPORT} != "no"
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
 .endif
 .endif
 
 .include <bsd.kmod.mk>
Index: stable/8/sys
===================================================================
--- stable/8/sys	(revision 220351)
+++ stable/8/sys	(revision 220352)

Property changes on: stable/8/sys
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys:r220124