Merge commit '5e2a074725cb7c16ea1c6554da11ab4d6b4e7aee'
commit87a73db24812e4cd6c4d34ce074a7e7c7b5f278e
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 23 Jan 2018 19:45:10 +0000 (23 14:45 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 23 Jan 2018 20:44:02 +0000 (23 15:44 -0500)
tree49318519468f2d77db1f99c576519194d1739aef
parent5432e1c996c6055e9cdff9d900bd42b29868dd9a
parent5e2a074725cb7c16ea1c6554da11ab4d6b4e7aee
Merge commit '5e2a074725cb7c16ea1c6554da11ab4d6b4e7aee'
kernel/drivers/net/i40e/i40e_gld.c
kernel/drivers/net/i40e/i40e_intr.c
kernel/drivers/net/i40e/i40e_sw.h
kernel/fs/zfs/sys/abd.h
share/man/man1/Makefile
share/man/man1/cal.1
share/man/man1/ps.1
usr/src/cmd/Makefile
usr/src/pkg/manifests/system-core-os.mf
usr/src/pkg/manifests/system-extended-system-utilities.mf
usr/src/uts/intel/io/vmxnet3s/vmxnet3_main.c