Merge commit '45681b8b0e59cad83c1547d78e25d4b7f218d635'
commite4d79d4a697bce3e653ad5474883ba89b45dc763
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 20 Jan 2018 20:09:04 +0000 (20 15:09 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 20 Jan 2018 20:09:04 +0000 (20 15:09 -0500)
treed93cce915c2c757bc987c50fe0ea37f8aaee8bf1
parentb46d2ec4d10a00fd613bb3e6015bc27f924bc4f9
parent45681b8b0e59cad83c1547d78e25d4b7f218d635
Merge commit '45681b8b0e59cad83c1547d78e25d4b7f218d635'
17 files changed:
kernel/fs/sockfs/socktpi.c
share/man/man3c/door_bind.3c
share/man/man3c/door_call.3c
share/man/man3c/door_create.3c
share/man/man3c/door_cred.3c
share/man/man3c/door_getparam.3c
share/man/man3c/door_info.3c
share/man/man3c/door_return.3c
share/man/man3c/door_revoke.3c
share/man/man3c/door_server_create.3c
share/man/man3c/door_ucred.3c
share/man/man3lib/libdoor.3lib
share/man/man5/pxeboot.5
usr/src/cmd/sa/Makefile
usr/src/lib/libc/port/nsl/rpc_callmsg.c
usr/src/uts/intel/io/vgatext/vgatext.c
usr/src/uts/intel/vgatext/Makefile