summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/os/main.c
diff options
context:
space:
mode:
authorDan McDonald <danmcd@joyent.com>2021-02-02 10:29:30 -0500
committerDan McDonald <danmcd@joyent.com>2021-02-02 10:33:55 -0500
commitfc716b10604146af1eb12bfb4f10a04ab2946fd4 (patch)
tree99eb0acd76e46558e01a8dcdac3e8e3adeff87d5 /usr/src/uts/common/os/main.c
parent1c15c8c54fbf8344904d3935475e5cf7f7a3b2eb (diff)
downloadillumos-joyent-fc716b10604146af1eb12bfb4f10a04ab2946fd4.tar.gz
Post-merge cleanup.
Includes early version of illumos#13490 and workaround for illumos#13492 Also includes manifest and driver_aliases corrections from this and one prior merge.
Diffstat (limited to 'usr/src/uts/common/os/main.c')
0 files changed, 0 insertions, 0 deletions