Index: stable/7/sys/boot/common =================================================================== --- stable/7/sys/boot/common (revision 180005) +++ stable/7/sys/boot/common (revision 180006) Property changes on: stable/7/sys/boot/common ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/boot/common:r173081,175019-175021,175417,176258-176260,179243,179490,179634,179670 Index: stable/7/sys/conf =================================================================== --- stable/7/sys/conf (revision 180005) +++ stable/7/sys/conf (revision 180006) Property changes on: stable/7/sys/conf ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/conf:r173081,175019-175021,175417,176258-176260,179099,179243,179490,179670 Index: stable/7/sys/dev/atkbdc =================================================================== --- stable/7/sys/dev/atkbdc (revision 180005) +++ stable/7/sys/dev/atkbdc (revision 180006) Property changes on: stable/7/sys/dev/atkbdc ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/dev/atkbdc:r173081,175019-175021,175417,176258-176260,179243,179474,179490,179670 Index: stable/7/sys/dev/ciss =================================================================== --- stable/7/sys/dev/ciss (revision 180005) +++ stable/7/sys/dev/ciss (revision 180006) Property changes on: stable/7/sys/dev/ciss ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/dev/ciss:r173081,175019-175021,175417,176258-176260,179243,179490,179670,179705 Index: stable/7/sys/dev/gem =================================================================== --- stable/7/sys/dev/gem (revision 180005) +++ stable/7/sys/dev/gem (revision 180006) Property changes on: stable/7/sys/dev/gem ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/dev/gem:r173081,175019-175021,175417,176258-176260,176996,179243,179490,179670 Index: stable/7/sys/dev/hme =================================================================== --- stable/7/sys/dev/hme (revision 180005) +++ stable/7/sys/dev/hme (revision 180006) Property changes on: stable/7/sys/dev/hme ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/dev/hme:r173081,175019-175021,175417,176258-176260,178589,179243,179490,179670 Index: stable/7/sys/dev/mfi =================================================================== --- stable/7/sys/dev/mfi (revision 180005) +++ stable/7/sys/dev/mfi (revision 180006) Property changes on: stable/7/sys/dev/mfi ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/dev/mfi:r179808,179860 Index: stable/7/sys/dev/mii =================================================================== --- stable/7/sys/dev/mii (revision 180005) +++ stable/7/sys/dev/mii (revision 180006) Property changes on: stable/7/sys/dev/mii ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/dev/mii:r173081,175019-175021,175417,176258-176260,179098,179243,179490,179670 Index: stable/7/sys/dev/usb =================================================================== --- stable/7/sys/dev/usb (revision 180005) +++ stable/7/sys/dev/usb (revision 180006) Property changes on: stable/7/sys/dev/usb ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/dev/usb:r173081,175019-175021,175417,176258-176260,178697,179243,179490,179670 Index: stable/7/sys/fs/cd9660 =================================================================== --- stable/7/sys/fs/cd9660 (revision 180005) +++ stable/7/sys/fs/cd9660 (revision 180006) Property changes on: stable/7/sys/fs/cd9660 ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/fs/cd9660:r173081,175019-175021,175417,176258-176260,179243,179490,179670,179722 Index: stable/7/sys/fs/tmpfs =================================================================== --- stable/7/sys/fs/tmpfs (revision 180005) +++ stable/7/sys/fs/tmpfs (revision 180006) Property changes on: stable/7/sys/fs/tmpfs ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/fs/tmpfs:r173081,175019-175021,175417,176258-176260,179243,179490,179670,179808 Index: stable/7/sys/geom/part =================================================================== --- stable/7/sys/geom/part (revision 180005) +++ stable/7/sys/geom/part (revision 180006) Property changes on: stable/7/sys/geom/part ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/geom/part:r179705,179722,179808,179860 Index: stable/7/sys/geom =================================================================== --- stable/7/sys/geom (revision 180005) +++ stable/7/sys/geom (revision 180006) Property changes on: stable/7/sys/geom ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/geom:r173081,175019-175021,175417,176258-176260,177509,177681,179243,179490,179670 Index: stable/7/sys/ia64/ia64 =================================================================== --- stable/7/sys/ia64/ia64 (revision 180005) +++ stable/7/sys/ia64/ia64 (revision 180006) Property changes on: stable/7/sys/ia64/ia64 ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/ia64/ia64:r173081,175019-175021,175417,176258-176260,179173,179243,179490,179670 Index: stable/7/sys/kern =================================================================== --- stable/7/sys/kern (revision 180005) +++ stable/7/sys/kern (revision 180006) Property changes on: stable/7/sys/kern ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/kern:r173081,175019-175021,175417,176258-176260,179242-179243,179490,179670 Index: stable/7/sys/modules/geom/geom_part =================================================================== --- stable/7/sys/modules/geom/geom_part (revision 180005) +++ stable/7/sys/modules/geom/geom_part (revision 180006) Property changes on: stable/7/sys/modules/geom/geom_part ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/modules/geom/geom_part:r176724,179705,179722,179808,179860 Index: stable/7/sys/modules/geom =================================================================== --- stable/7/sys/modules/geom (revision 180005) +++ stable/7/sys/modules/geom (revision 180006) Property changes on: stable/7/sys/modules/geom ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/modules/geom:r173081,175019-175021,175417,176258-176260,176724,179099,179243,179490,179670 Index: stable/7/sys/modules =================================================================== --- stable/7/sys/modules (revision 180005) +++ stable/7/sys/modules (revision 180006) Property changes on: stable/7/sys/modules ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/modules:r173081,175019-175021,175417,176258-176260,179099,179243,179490,179670 Index: stable/7/sys/nlm =================================================================== --- stable/7/sys/nlm (revision 180005) +++ stable/7/sys/nlm (revision 180006) Property changes on: stable/7/sys/nlm ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/nlm:r176724,176996,177509,179474,179634,179705,179722,179808,179860 Index: stable/7/sys/pci =================================================================== --- stable/7/sys/pci (revision 180005) +++ stable/7/sys/pci (revision 180006) Property changes on: stable/7/sys/pci ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/sys/pci:r173081,175019-175021,175417,176258-176260,179243,179490,179670,179860 Index: stable/7/sys =================================================================== --- stable/7/sys (revision 180005) +++ stable/7/sys (revision 180006) Property changes on: stable/7/sys ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys:r176724,176996,177509,177681,178589,178697,179098-179099,179173,179242,179474,179634,179705,179722,179808,179860