Index: stable/7/sys/pci/nfsmb.c
===================================================================
--- stable/7/sys/pci/nfsmb.c	(revision 179998)
+++ stable/7/sys/pci/nfsmb.c	(revision 179999)

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

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