Merge branch 'master' of git://github.com/illumos/illumos-gate
commitcc990354dd6800bf7787472d194194246216b714
authorToomas Soome <tsoome@me.com>
Sat, 24 Sep 2016 10:11:12 +0000 (24 13:11 +0300)
committerToomas Soome <tsoome@me.com>
Sat, 24 Sep 2016 10:11:12 +0000 (24 13:11 +0300)
tree92e277dbe012b773a62d811ba0d708451f69b5b7
parent1c9bcd8ba8cf73e81a5e3c69f4e3e61d5088f1b2
parent4220fdc152e5dfec9a1dd51452175295f3684689
Merge branch 'master' of git://github.com/illumos/illumos-gate
usr/src/cmd/boot/installboot/i386/Makefile
usr/src/lib/libzfs/common/libzfs_mount.c
usr/src/man/man1m/boot.1m
usr/src/test/libc-tests/tests/Makefile
usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile
usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile
usr/src/uts/common/disp/sysdc.c
usr/src/uts/common/os/kmem.c
usr/src/uts/common/sys/mman.h
usr/src/uts/common/vm/vm_as.c
usr/src/uts/common/vm/vm_page.c