Merge commit '5e2cca1843c61ee0ef1bb95c5dddc9b450b790c6'
commit818d8e9549df7d441ee6fb3fb22567377e67254d
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 5 Jan 2019 23:44:11 +0000 (5 18:44 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 5 Jan 2019 23:44:11 +0000 (5 18:44 -0500)
tree24c01a980e8e0f14857216004c2f3eb6d4eb0c3f
parent03081b5646f8a0cf329355dbea8eec83ef544183
parent5e2cca1843c61ee0ef1bb95c5dddc9b450b790c6
Merge commit '5e2cca1843c61ee0ef1bb95c5dddc9b450b790c6'
arch/x86/include/sys/bootconf.h
arch/x86/kernel/os/ddi_impl.c
arch/x86/kernel/os/fakebop.c
kernel/font/font.c
kernel/fs/nfs/nfs4_srv.c
usr/src/boot/sys/boot/efi/loader/main.c
usr/src/cmd/mdb/common/mdb/mdb_cmds.c
usr/src/uts/common/io/tem.c