Index: stable/8/sys/amd64/include/xen
===================================================================
--- stable/8/sys/amd64/include/xen	(revision 197328)
+++ stable/8/sys/amd64/include/xen	(revision 197329)

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

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

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

Property changes on: stable/8/sys/contrib/pf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/pf:r197260-197263
Index: stable/8/sys/dev/ciss
===================================================================
--- stable/8/sys/dev/ciss	(revision 197328)
+++ stable/8/sys/dev/ciss	(revision 197329)

Property changes on: stable/8/sys/dev/ciss
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,9 +0,0 ##
   Reverse-merged /head/sys/dev/ciss:r196118,196121-196122,196129,196132,196135,196141-196142,196149-196150,196152,196159,196174,196176,196179,196193,196196,196200-196201,196203-196206,196224,196226,196228-196230,196234,196246,196256,196260,196263,196267-196269,196274,196276,196289,196291,196293,196295,196297,196299,196301,196303,196307,196309,196316,196318,196326,196332-196334,196342,196352-196353,196358,196364,196366,196368,196370,196372,196376,196378,196380,196386,196388,196390,196395,196397,196403-196404,196410,196412,196415,196417,196419,196423,196435,196455-196458,196460,196481-196482,196489,196498,196501-196505,196509-196510,196512,196516-196517,196520,196529,196531-196536,196547,196551,196553,196556,196559-196560,196567-196569,196579,196592,196608-196610,196633,196635,196637,196640,196643-196644,196648-196649,196653,196655-196657,196659-196660,196662,196678,196689,196692,196702-196703,196705,196707,196714,196717,196721,196730,196733,196738,196745,196772,196777,196785,196796,196809,196822-196824,196835,196864-196865,196871,196887-196889,196919-196921,196927,196932,196943-196944,196947,196953-196954,196965-196966,196978-196980,196982,196985,196993,197030-197031,197039-197040,197046,197048-197049,197062,197073-197074,197077-197080,197099,197129-197133,197150-197153,197156,197167,197172-197173,197177,197201,197203,197208,197210,197212,197218-197219,197223-197225,197227,197235,197257,197260-197263
   Reverse-merged /user/mav/ata/sys/dev/ciss:r189793-190578
   Reverse-merged /user/thompsa/usb/sys/dev/ciss:r187190
   Reverse-merged /user/dfr/xenhvm/6/sys/dev/ciss:r189304,189451
   Reverse-merged /user/dfr/xenhvm/7/sys/dev/ciss:r188574-189614
   Reverse-merged /user/piso/sys/dev/ciss:r186543,186723,186725-186726,186742,186770-186771,186774,186777-186779,187984-187985,190555,190572,190589,190592,190614,190625,190830
   Reverse-merged /projects/cambria/sys/dev/ciss:r186008-186350
   Reverse-merged /user/peter/kinfo/sys/dev/ciss:r185413-185547
   Reverse-merged /user/piso/ipfw/sys/dev/ciss:r190918,190921,190923,190926
Index: stable/8/sys/dev/xen/xenpci
===================================================================
--- stable/8/sys/dev/xen/xenpci	(revision 197328)
+++ stable/8/sys/dev/xen/xenpci	(revision 197329)

Property changes on: stable/8/sys/dev/xen/xenpci
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/dev/xen/xenpci:r197260-197263
Index: stable/8/sys
===================================================================
--- stable/8/sys	(revision 197328)
+++ stable/8/sys	(revision 197329)

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