Index: user/ngie/stable-10-libnv/sys/gnu/dts =================================================================== --- user/ngie/stable-10-libnv/sys/gnu/dts (revision 292911) +++ user/ngie/stable-10-libnv/sys/gnu/dts (revision 292912) Property changes on: user/ngie/stable-10-libnv/sys/gnu/dts ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/gnu/dts:r264001,264006 Index: user/ngie/stable-10-libnv =================================================================== --- user/ngie/stable-10-libnv (revision 292911) +++ user/ngie/stable-10-libnv (revision 292912) Property changes on: user/ngie/stable-10-libnv ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r264001,264006