Merge commit '8f022dd6c1ebe3edc269726bf537617e665df32f' into merges
commit962808384f2b499a57889ed0de7d088705b2e83b
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 15:31:01 +0000 (18 11:31 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 15:31:01 +0000 (18 11:31 -0400)
tree567db8e87e66758906cea7d830822c3aeeb786d5
parent1f0abc62cc6859b94672dd4910fa1809ac42171a
parent8f022dd6c1ebe3edc269726bf537617e665df32f
Merge commit '8f022dd6c1ebe3edc269726bf537617e665df32f' into merges
kernel/net/ip/ip_attr.c
share/man/man8/nvmeadm.8
usr/src/uts/common/io/mac/mac_datapath_setup.c
usr/src/uts/common/io/mac/mac_sched.c