Merge ^/head r305017 through r305028.
authordim <dim@FreeBSD.org>
Mon, 29 Aug 2016 20:57:09 +0000 (20:57 +0000)
committerdim <dim@FreeBSD.org>
Mon, 29 Aug 2016 20:57:09 +0000 (20:57 +0000)
commit50c9166a7d2821f4ce0d6d09fd1d73f33b671898
tree96844366b251a7262c53f535ae57845749d62ca5
parent84a9534108fdecbc7bf7e2d8badfa9dd8fc23068
Merge ^/head r305017 through r305028.
cddl/usr.sbin/zfsd/Makefile
cddl/usr.sbin/zfsd/Makefile.common
cddl/usr.sbin/zfsd/tests/Makefile
lib/libc/sys/ptrace.2
sys/boot/efi/libefi/efi_console.c
sys/dev/ioat/ioat.c
usr.sbin/bluetooth/btpand/bnep.c
usr.sbin/bluetooth/btpand/btpand.h