Merge commit '508de9f313d4260d23954085ed866e727901964c'
commit436d7465e5d8c5c12fbb749ccb36d60e150aa7b3
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 6 Jan 2019 00:54:08 +0000 (5 19:54 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 6 Jan 2019 00:54:08 +0000 (5 19:54 -0500)
tree029440f451b80f09839670f6517d14da9e7223a6
parentb448858e290afba2c787c69f03f706aecce76715
parent508de9f313d4260d23954085ed866e727901964c
Merge commit '508de9f313d4260d23954085ed866e727901964c'
arch/x86/include/sys/bootconf.h
arch/x86/kernel/os/fakebop.c
include/sys/efi_partition.h
include/sys/kobj_impl.h
include/sys/vtoc.h
kernel/krtld/bootrd.c
kernel/krtld/kobj.c
kernel/krtld/kobj_subr.c
usr/src/cmd/format/menu_command.c