Index: stable/6/sys/dev/ciss/ciss.c
===================================================================
--- stable/6/sys/dev/ciss/ciss.c	(revision 179992)
+++ stable/6/sys/dev/ciss/ciss.c	(revision 179993)

Property changes on: stable/6/sys/dev/ciss/ciss.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,1 +0,0 ##
   Reverse-merged /head/sys/dev/ciss/ciss.c:r165854,173081,175019-175021,175417,179705
Index: stable/6/sys/dev/ciss
===================================================================
--- stable/6/sys/dev/ciss	(revision 179992)
+++ stable/6/sys/dev/ciss	(revision 179993)

Property changes on: stable/6/sys/dev/ciss
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/dev/ciss:r165854,173081,175019-175021,175417,179705