diff options
author | Dan McDonald <danmcd@joyent.com> | 2021-01-25 11:14:41 -0500 |
---|---|---|
committer | Dan McDonald <danmcd@joyent.com> | 2021-01-25 11:14:52 -0500 |
commit | ca7e98efc99f1be718cca849bd004b6d5ca2ce58 (patch) | |
tree | 8da70ed97c791a851b3677d8c4efacb545ffd3b3 /usr/src/uts/common/os/main.c | |
parent | e05887f4dd19afc4c565b1a121b48a9b06038831 (diff) | |
parent | 231216303cc2106896aa2c2d6c25a0da912f7593 (diff) | |
download | illumos-joyent-ca7e98efc99f1be718cca849bd004b6d5ca2ce58.tar.gz |
[illumos-gate merge]
commit 231216303cc2106896aa2c2d6c25a0da912f7593
13466 Jan 2021 hwdata update
commit c8be5715fd9a89586c31edc5adb84bad9dcc5a9f
13464 Want pchtemp support for 400 series desktop PCH
13465 Want pchtemp support for Broadwell-U
commit 4955144cafa51275edcbd524ec7401038df30387
13458 bhyve flushes ASID needlessly
commit f85f43ed9f8f93958ca75033d5f390666baa0b6c
13346 diskinfo should identify lofi(7D) devices
Conflicts:
usr/src/lib/libdiskmgt/common/findevs.c
Diffstat (limited to 'usr/src/uts/common/os/main.c')
0 files changed, 0 insertions, 0 deletions