Merge ^/head r296007 through r296368.
authorDimitry Andric <dim@FreeBSD.org>
Thu, 3 Mar 2016 23:15:46 +0000 (23:15 +0000)
committerDimitry Andric <dim@FreeBSD.org>
Thu, 3 Mar 2016 23:15:46 +0000 (23:15 +0000)
commit82aa34e6fa1cd5a4ad401383522daf51412ea4b2
tree933ca1d4eee78dcba4bd7cb9578fbf354cd90bbb
parentada554fc20020766e79f991c0412c66e0604e427
parentd7acb49aeeaef0a35b05869bd8345c4b8c7c7481
Merge ^/head r296007 through r296368.
Makefile.inc1
ObsoleteFiles.inc
etc/mtree/BSD.debug.dist
sys/conf/kmod.mk