Index: stable/8/sys/amd64/include/xen
===================================================================
--- stable/8/sys/amd64/include/xen	(revision 220268)
+++ stable/8/sys/amd64/include/xen	(revision 220269)

Property changes on: stable/8/sys/amd64/include/xen
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/amd64/include/xen:r219364
Index: stable/8/sys/amd64/linux32/linux32_genassym.c
===================================================================
--- stable/8/sys/amd64/linux32/linux32_genassym.c	(revision 220268)
+++ stable/8/sys/amd64/linux32/linux32_genassym.c	(revision 220269)
@@ -1,16 +1,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/assym.h>
 #include <sys/systm.h>
 
 #include <amd64/linux32/linux.h>
 
 ASSYM(LINUX_SIGF_HANDLER, offsetof(struct l_sigframe, sf_handler));
 ASSYM(LINUX_SIGF_SC, offsetof(struct l_sigframe, sf_sc));
-ASSYM(LINUX_SC_ES, offsetof(struct l_sigcontext, sc_es));
-ASSYM(LINUX_SC_DS, offsetof(struct l_sigcontext, sc_ds));
 ASSYM(LINUX_RT_SIGF_HANDLER, offsetof(struct l_rt_sigframe, sf_handler));
 ASSYM(LINUX_RT_SIGF_UC, offsetof(struct l_rt_sigframe, sf_sc));
 ASSYM(LINUX_RT_SIGF_SC, offsetof(struct l_ucontext, uc_mcontext));
Index: stable/8/sys/cddl/contrib/opensolaris
===================================================================
--- stable/8/sys/cddl/contrib/opensolaris	(revision 220268)
+++ stable/8/sys/cddl/contrib/opensolaris	(revision 220269)

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

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

Property changes on: stable/8/sys/contrib/pf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/pf:r219364
Index: stable/8/sys
===================================================================
--- stable/8/sys	(revision 220268)
+++ stable/8/sys	(revision 220269)

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