Index: stable/7/sys/dev/ciss/ciss.c
===================================================================
--- stable/7/sys/dev/ciss/ciss.c	(revision 179997)
+++ stable/7/sys/dev/ciss/ciss.c	(revision 179998)

Property changes on: stable/7/sys/dev/ciss/ciss.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,1 +0,0 ##
   Reverse-merged /head/sys/dev/ciss/ciss.c:r173081,175019-175021,175417,176258-176260,179243,179490,179670,179705
Index: stable/7/sys/dev/ciss
===================================================================
--- stable/7/sys/dev/ciss	(revision 179997)
+++ stable/7/sys/dev/ciss	(revision 179998)

Property changes on: stable/7/sys/dev/ciss
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/dev/ciss:r173081,175019-175021,175417,176258-176260,179243,179490,179670,179705