Merge commit '15aeb4d1148772724cf568e1f7a13fbb99f11ab8'
commit33476c42a0b1fa041a2ff62b8a9b77072062a330
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 23 Nov 2018 19:50:15 +0000 (23 14:50 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 23 Nov 2018 19:50:15 +0000 (23 14:50 -0500)
treed109c8b2b707fd4d794ed5b0ea7e032a6f340b6e
parent383d541f7072e13286a7ff943626a3bb668348c0
parent15aeb4d1148772724cf568e1f7a13fbb99f11ab8
Merge commit '15aeb4d1148772724cf568e1f7a13fbb99f11ab8'
arch/x86/include/sys/x86_archext.h
arch/x86/kernel/os/cpuid.c
arch/x86/kernel/os/trap.c
include/sys/pci.h
include/sys/pci_impl.h
kernel/drivers/virtio/virtio.c
kernel/os/main.c
usr/src/uts/i86pc/io/apix/apix.c
usr/src/uts/i86pc/io/pcplusmp/apic_common.c
usr/src/uts/intel/io/pci/pci_boot.c