diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-14 13:04:14 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-14 13:04:14 +0000 |
| commit | 0b570b3cb1c0bf505f1b1bd352664d638b8cc359 (patch) | |
| tree | 1cc85aa3f13c89e97e995459743e8783187edc40 /exception_lists/copyright | |
| parent | c767c5a53dc0ab8ce9e92ab7599f7f3740819bfc (diff) | |
| parent | ebee07ff4f102cbd3179db7c5070283da35a79f3 (diff) | |
| download | illumos-joyent-0b570b3cb1c0bf505f1b1bd352664d638b8cc359.tar.gz | |
[illumos-gate merge]
commit ebee07ff4f102cbd3179db7c5070283da35a79f3
10515 libtopo's XML serialization code is broken and incomplete
10516 fmtopo is missing code to handle properties of type TOPO_TYPE_FMRI_ARRAY
commit 08f1bbed5edd2a2e9c8be7b7424c32e67c2f3f2c
10323 cpcgen_parse_model() gets value check wrong
commit 4a178c575468012cff81a61da4850385129bf983
10539 Update hwdata to 2019.03.12
Conflicts:
exception_lists/copyright
Diffstat (limited to 'exception_lists/copyright')
| -rw-r--r-- | exception_lists/copyright | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/exception_lists/copyright b/exception_lists/copyright index a03714a6c5..e61e757f8e 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -123,9 +123,11 @@ usr/src/common/ficl/* usr/src/contrib/* usr/src/data/hwdata/THIRDPARTYLICENSE.efifixes.descrip usr/src/data/hwdata/THIRDPARTYLICENSE.efifixes.tmpl +usr/src/data/hwdata/pci.ids +usr/src/data/hwdata/usb.ids +usr/src/data/perfmon/* usr/src/data/ucode/amd/* usr/src/data/ucode/intel/* -usr/src/data/perfmon/* usr/src/grub/grub-0.97/stage2/Makefile.am usr/src/grub/grub-0.97/stage2/builtins.c usr/src/grub/grub-0.97/stage2/disk_io.c |