Index: stable/9/sys/amd64/include/xen
===================================================================
--- stable/9/sys/amd64/include/xen	(revision 235762)
+++ stable/9/sys/amd64/include/xen	(revision 235763)

Property changes on: stable/9/sys/amd64/include/xen
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/amd64/include/xen:r230775
Index: stable/9/sys/boot/i386/efi
===================================================================
--- stable/9/sys/boot/i386/efi	(revision 235762)
+++ stable/9/sys/boot/i386/efi	(revision 235763)

Property changes on: stable/9/sys/boot/i386/efi
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/i386/efi:r230775
Index: stable/9/sys/boot/ia64/efi
===================================================================
--- stable/9/sys/boot/ia64/efi	(revision 235762)
+++ stable/9/sys/boot/ia64/efi	(revision 235763)

Property changes on: stable/9/sys/boot/ia64/efi
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/ia64/efi:r230775
Index: stable/9/sys/boot/ia64/ski
===================================================================
--- stable/9/sys/boot/ia64/ski	(revision 235762)
+++ stable/9/sys/boot/ia64/ski	(revision 235763)

Property changes on: stable/9/sys/boot/ia64/ski
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/ia64/ski:r230775
Index: stable/9/sys/boot/powerpc/boot1.chrp
===================================================================
--- stable/9/sys/boot/powerpc/boot1.chrp	(revision 235762)
+++ stable/9/sys/boot/powerpc/boot1.chrp	(revision 235763)

Property changes on: stable/9/sys/boot/powerpc/boot1.chrp
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/powerpc/boot1.chrp:r230775
Index: stable/9/sys/boot/powerpc/ofw
===================================================================
--- stable/9/sys/boot/powerpc/ofw	(revision 235762)
+++ stable/9/sys/boot/powerpc/ofw	(revision 235763)

Property changes on: stable/9/sys/boot/powerpc/ofw
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/powerpc/ofw:r230775
Index: stable/9/sys/boot
===================================================================
--- stable/9/sys/boot	(revision 235762)
+++ stable/9/sys/boot	(revision 235763)

Property changes on: stable/9/sys/boot
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot:r230775
Index: stable/9/sys/cddl/contrib/opensolaris
===================================================================
--- stable/9/sys/cddl/contrib/opensolaris	(revision 235762)
+++ stable/9/sys/cddl/contrib/opensolaris	(revision 235763)

Property changes on: stable/9/sys/cddl/contrib/opensolaris
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/cddl/contrib/opensolaris:r230775
Index: stable/9/sys/conf
===================================================================
--- stable/9/sys/conf	(revision 235762)
+++ stable/9/sys/conf	(revision 235763)

Property changes on: stable/9/sys/conf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,1 +0,1 ##
   Reverse-merged /head/sys/conf:r230775*
   Merged /head/sys/conf:r230775
Index: stable/9/sys/contrib/dev/acpica
===================================================================
--- stable/9/sys/contrib/dev/acpica	(revision 235762)
+++ stable/9/sys/contrib/dev/acpica	(revision 235763)

Property changes on: stable/9/sys/contrib/dev/acpica
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/dev/acpica:r230775
Index: stable/9/sys/contrib/octeon-sdk
===================================================================
--- stable/9/sys/contrib/octeon-sdk	(revision 235762)
+++ stable/9/sys/contrib/octeon-sdk	(revision 235763)

Property changes on: stable/9/sys/contrib/octeon-sdk
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/octeon-sdk:r230775
Index: stable/9/sys/contrib/pf
===================================================================
--- stable/9/sys/contrib/pf	(revision 235762)
+++ stable/9/sys/contrib/pf	(revision 235763)

Property changes on: stable/9/sys/contrib/pf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/pf:r230775
Index: stable/9/sys/contrib/x86emu
===================================================================
--- stable/9/sys/contrib/x86emu	(revision 235762)
+++ stable/9/sys/contrib/x86emu	(revision 235763)

Property changes on: stable/9/sys/contrib/x86emu
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/x86emu:r230775
Index: stable/9/sys/dev/e1000
===================================================================
--- stable/9/sys/dev/e1000	(revision 235762)
+++ stable/9/sys/dev/e1000	(revision 235763)

Property changes on: stable/9/sys/dev/e1000
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/dev/e1000:r230775
Index: stable/9/sys/dev
===================================================================
--- stable/9/sys/dev	(revision 235762)
+++ stable/9/sys/dev	(revision 235763)

Property changes on: stable/9/sys/dev
___________________________________________________________________
Modified: svn:mergeinfo
## -0,1 +0,1 ##
   Reverse-merged /head/sys/dev:r230775*
   Merged /head/sys/dev:r230775
Index: stable/9/sys/fs/ntfs
===================================================================
--- stable/9/sys/fs/ntfs	(revision 235762)
+++ stable/9/sys/fs/ntfs	(revision 235763)

Property changes on: stable/9/sys/fs/ntfs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/fs/ntfs:r230775
Index: stable/9/sys/fs
===================================================================
--- stable/9/sys/fs	(revision 235762)
+++ stable/9/sys/fs	(revision 235763)

Property changes on: stable/9/sys/fs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/fs:r230775
Index: stable/9/sys/modules
===================================================================
--- stable/9/sys/modules	(revision 235762)
+++ stable/9/sys/modules	(revision 235763)

Property changes on: stable/9/sys/modules
___________________________________________________________________
Modified: svn:mergeinfo
## -0,1 +0,1 ##
   Reverse-merged /head/sys/modules:r230775*
   Merged /head/sys/modules:r230775
Index: stable/9/sys
===================================================================
--- stable/9/sys	(revision 235762)
+++ stable/9/sys	(revision 235763)

Property changes on: stable/9/sys
___________________________________________________________________
Modified: svn:mergeinfo
## -0,2 +0,1 ##
   Reverse-merged /head/sys:r230775*
   Reverse-merged /head/sys/dev/ixgbe:r228276*
   Merged /head/sys:r230775