Merge ^/head r296007 through r296368.
authordim <dim@FreeBSD.org>
Thu, 3 Mar 2016 23:15:46 +0000 (23:15 +0000)
committerdim <dim@FreeBSD.org>
Thu, 3 Mar 2016 23:15:46 +0000 (23:15 +0000)
commit9ac7ec88271f4a2dca21389be4d8f3c51f6b66f4
tree933ca1d4eee78dcba4bd7cb9578fbf354cd90bbb
parentd50a25246889bd164391143e1394f0c845d954ae
parentaa85fc5f7d9ad16a9160db16293329e874f53bc4
Merge ^/head r296007 through r296368.
Makefile.inc1
ObsoleteFiles.inc
etc/mtree/BSD.debug.dist
sys/conf/kmod.mk