Merge commit 'db1c88f6dab43484b6c33636600ac4596ff4c354'
commitb30cf8a265def39ca5bba4fd2e05ae21a4755b7e
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 21:20:21 +0000 (21 17:20 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 21:20:21 +0000 (21 17:20 -0400)
tree79398d81b0b04d661994e05163b1dd5896a8e132
parent2c5019ee818d272497318907e176b5491c958785
parentdb1c88f6dab43484b6c33636600ac4596ff4c354
Merge commit 'db1c88f6dab43484b6c33636600ac4596ff4c354'
include/sys/conf.h
include/sys/stream.h
kernel/os/streamio.c
kernel/os/strsubr.c
usr/src/cmd/rcap/rcapd/Makefile
usr/src/pkg/manifests/service-resource-cap.mf
usr/src/uts/common/io/ldterm.c
usr/src/uts/common/io/usb/clients/hid/hid.c
usr/src/uts/i86pc/io/apix/apix.c