[illumos-gate merge]

commit b599bd937c305a895426e8c412ca920ce7824850 5821 need strerror_l() 6133 message translations don't honor per-thread locales 6142 extra space in newlocale synopsis 6181 symbol test shouldn't leave gcc fix-includes to chance commit 2e4218261bfb4720d6310a5247487667d7448732 6285 Update hwdata - 20151005
author: Jerry Jelinek <jerry.jelinek@joyent.com> 2015-10-06 11:53:38 +0000
committer: Jerry Jelinek <jerry.jelinek@joyent.com> 2015-10-06 11:53:38 +0000
commit: aabf397c64f21eddc6f5719b6dc3168e8c27c4ff (patch)
tree: afc652569a993dd370b24fbf0285c1b0f4d62852 /usr/src
parent: e3cab2d72b5decf703884eca70da83ce7b7d365b (diff)
parent: b599bd937c305a895426e8c412ca920ce7824850 (diff)
download: illumos-joyent-aabf397c64f21eddc6f5719b6dc3168e8c27c4ff.tar.gz
41 files changed, 2473 insertions, 650 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 2ed74a7c62..7696592602 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -188,6 +188,7 @@ UNIQ=		/usr/bin/uniq
 TAR=		/usr/bin/tar
 ASTBINDIR=	/usr/ast/bin
 MSGCC=		$(ASTBINDIR)/msgcc
+MSGFMT=		/usr/bin/msgfmt -s
 
 FILEMODE=	644
 DIRMODE=	755
diff --git a/usr/src/cmd/hwdata/pci.ids b/usr/src/cmd/hwdata/pci.ids
index 84d2d53b49..363c5cada2 100644
--- a/usr/src/cmd/hwdata/pci.ids
+++ b/usr/src/cmd/hwdata/pci.ids
@@ -1,11 +1,11 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2015.03.17
-#	Date:    2015-03-17 03:15:01
+#	Version: 2015.10.04
+#	Date:    2015-10-04 03:15:02
 #
-#	Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
-#	PCI ID Project at http://pci-ids.ucw.cz/.
+#	Maintained by Albert Pool, Martin Mares, and other volunteers from
+#	the PCI ID Project at http://pci-ids.ucw.cz/.
 #
 #	New data are always welcome, especially if they are accurate. If you have
 #	anything to contribute, please follow the instructions at the web site.
@@ -21,6 +21,7 @@
 #	device  device_name				<-- single tab
 #		subvendor subdevice  subsystem_name	<-- two tabs
 
+0001  SafeNet (wrong ID)
 0010  Allied Telesis, Inc (Wrong ID)
 # This is a relabelled RTL-8139
 	8139  AT-2500TX V3 Ethernet
@@ -285,6 +286,10 @@
 	0050  SAS1064 PCI-X Fusion-MPT SAS
 		1028 1f04  SAS 5/E
 		1028 1f09  SAS 5i/R
+	0052  MegaRAID SAS-3 3216/3224 [Cutlass]
+	0053  MegaRAID SAS-3 3216/3224 [Cutlass]
+		1000 9350  MegaRAID SAS 9341-16i
+		1000 9351  MegaRAID SAS 9341-24i
 	0054  SAS1068 PCI-X Fusion-MPT SAS
 		1028 1f04  SAS 5/E Adapter Controller
 		1028 1f05  SAS 5/i Adapter Controller
@@ -342,6 +347,7 @@
 		8086 3513  RMS25CB080 RAID Controller
 	005c  SAS1064A PCI-X Fusion-MPT SAS
 	005d  MegaRAID SAS-3 3108 [Invader]
+		1000 9361  MegaRAID SAS 9361-8i
 		1028 1f41  PERC H830 Adapter
 		1028 1f42  PERC H730P Adapter
 		1028 1f43  PERC H730 Adapter
@@ -360,6 +366,7 @@
 		1028 1f4b  PERC H330 Mini
 		1028 1f4c  PERC H330 Mini (for blades)
 		1028 1f4d  PERC H330 Embedded (for monolithic)
+		1054 306a  SAS 3004 iMR ROMB
 	0060  MegaRAID SAS 1078
 		1000 1006  MegaRAID SAS 8888ELP
 		1000 100a  MegaRAID SAS 8708ELP
@@ -490,6 +497,21 @@
 	0097  SAS3008 PCI-Express Fusion-MPT SAS-3
 		1028 1f45  12GB/s HBA internal
 		1028 1f46  12Gbps HBA
+	00c0  SAS3324 PCI-Express Fusion-MPT SAS-3
+	00c1  SAS3324 PCI-Express Fusion-MPT SAS-3
+	00c2  SAS3324 PCI-Express Fusion-MPT SAS-3
+	00c3  SAS3324 PCI-Express Fusion-MPT SAS-3
+	00c4  SAS3224 PCI-Express Fusion-MPT SAS-3
+	00c5  SAS3316 PCI-Express Fusion-MPT SAS-3
+	00c6  SAS3316 PCI-Express Fusion-MPT SAS-3
+	00c7  SAS3316 PCI-Express Fusion-MPT SAS-3
+	00c8  SAS3316 PCI-Express Fusion-MPT SAS-3
+	00c9  SAS3216 PCI-Express Fusion-MPT SAS-3
+	00ce  MegaRAID SAS-3 3316 [Intruder]
+		1000 9371  MegaRAID SAS 9361-16i
+		1000 9390  MegaRAID SAS 9380-8i8e
+	00cf  MegaRAID SAS-3 3324 [Intruder]
+		1000 9370  MegaRAID SAS 9361-24i
 	0407  MegaRAID
 		1000 0530  MegaRAID 530 SCSI 320-0X RAID Controller
 		1000 0531  MegaRAID 531 SCSI 320-4X RAID Controller
@@ -643,6 +665,7 @@
 		18bc 0101  GC-R9600PRO (Primary)
 	4151  RV350 [Radeon 9600 Series]
 		1043 c004  A9600SE
+		174b 7c37  Radeon 9600 SE
 	4152  RV360 [Radeon 9600/X1050 Series]
 		1002 0002  Radeon 9600XT
 		1002 4772  All-in-Wonder 9600 XT
@@ -672,6 +695,7 @@
 		18bc 0100  GC-R9600PRO (Secondary)
 	4171  RV350 [Radeon 9600] (Secondary)
 		1043 c005  A9600SE (Secondary)
+		174b 7c36  Radeon 9600 SE (secondary)
 	4172  RV350 [Radeon 9600/X1050 Series] (Secondary)
 		1002 0003  Radeon 9600XT (Secondary)
 		1002 4773  All-in-Wonder 9600 XT (Secondary)
@@ -1067,8 +1091,9 @@
 	4e4a  R360 [Radeon 9800 XXL/XT]
 		1002 4e4a  R360 [Radeon 9800 XT]
 	4e4b  R350 GL [FireGL X2 AGP Pro]
-	4e50  RV350/M10 [Mobility Radeon 9600 PRO Turbo]
+	4e50  RV350/M10 / RV360/M11 [Mobility Radeon 9600 (PRO) / 9700]
 		1025 005a  TravelMate 290
+		1025 0064  Extensa 3000 series laptop: ATI RV360/M11 [Mobility Radeon 9700]
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
 		144d c00c  P35 notebook
@@ -1168,6 +1193,7 @@
 		1458 4002  RV100 QY [RADEON 7000 PRO MAYA AV Series]
 		148c 2003  RV100 QY [Radeon 7000 Multi-Display Edition]
 		148c 2023  RV100 QY [Radeon 7000 Evil Master Multi-Display]
+		148c 2081  RV6DE
 		174b 0280  Radeon RV100 QY [Radeon 7000/VE]
 		174b 7112  Radeon VE 7000
 		174b 7c28  Radeon VE 7000 DDR
@@ -1252,7 +1278,7 @@
 	5652  RV410/M26 [Mobility Radeon X700]
 	5653  RV410/M26 [Mobility Radeon X700]
 		1025 0080  Aspire 5024WLMi
-		103c 0940  HP Compaq NW8240 Mobile Workstation
+		103c 0940  Compaq NW8240 Mobile Workstation
 	5654  264VT [Mach64 VT]
 		1002 5654  Mach64VT Reference
 	5655  264VT3 [Mach64 VT3]
@@ -1443,25 +1469,31 @@
 	6602  Mars
 	6603  Mars
 	6604  Opal XT [Radeon R7 M265]
+		103c 8006  FirePro M4170
+		17aa 3643  Radeon R7 A360
 	6605  Opal PRO [Radeon R7 M260]
 	6606  Mars XTX [Radeon HD 8790M]
 		1028 0684  FirePro W4170M
 	6607  Mars LE [Radeon HD 8530M / R5 M240]
 	6608  Oland GL [FirePro W2100]
-	6610  Oland XT [Radeon HD 8670 / R7 250]
+	6610  Oland XT [Radeon HD 8670 / R7 250/350]
 		1019 0030  Radeon HD 8670
 		1028 2120  Radeon R7 250
 		1028 2322  Radeon R7 250
 		1462 2910  Radeon HD 8670
 		1462 2911  Radeon HD 8670
+		148c 7350  Radeon R7 350
 		1642 3c81  Radeon HD 8670
 		1642 3c91  Radeon HD 8670
-	6611  Oland [Radeon HD 8570 / R7 240 OEM]
+		1642 3f09  Radeon R7 350
+	6611  Oland [Radeon HD 8570 / R7 240/340 OEM]
 		1028 210b  Radeon R5 240 OEM
 		174b 4248  Radeon R7 240 OEM
 		174b a240  Radeon R7 240 OEM
+		174b d340  Radeon R7 340 OEM
 		1b0a 90d3  Radeon R7 240 OEM
-	6613  Oland PRO [Radeon R7 240]
+	6613  Oland PRO [Radeon R7 240/340]
+		148c 7340  Radeon R7 340
 		1682 7240  R7 240 2048 MB
 	6620  Mars
 	6621  Mars PRO
@@ -1474,29 +1506,42 @@
 	6649  Bonaire [FirePro W5100]
 	6650  Bonaire
 	6651  Bonaire
-	6658  Bonaire XTX [Radeon R7 260X]
-	665c  Bonaire XT [Radeon HD 7790/8770 / R9 260 OEM]
+	6658  Bonaire XTX [Radeon R7 260X/360]
+		148c 0907  Radeon R7 360
+		1682 0907  Radeon R7 360
+		1682 7360  Radeon R7 360
+	665c  Bonaire XT [Radeon HD 7790/8770 / R7 360 / R9 260/360 OEM]
 		1043 0452  Radeon HD 7790 DirectCU II OC
 # R7790-1GD5/OC
 		1462 2930  Radeon HD 7790 OC
 		1462 2932  Radeon HD 8770
 		1462 2934  Radeon R9 260 OEM
+		1462 2938  Radeon R9 360 OEM
+		148c 0907  Radeon R7 360
 		148c 9260  Radeon R9 260 OEM
+		148c 9360  Radeon R9 360 OEM
+		1682 0907  Radeon R7 360
 # FX-779A-CDB4 / FX-779A-CDBC
 		1682 3310  Radeon HD 7790 Black Edition 2 GB
 # 100356OCL / 11210-01-20G
 		174b e253  Radeon HD 7790 Dual-X OC
 		1787 2329  Radeon HD 7790 TurboDuo
 	665d  Bonaire [Radeon R7 200 Series]
-	665f  Tobago [Radeon R7 300 Series]
-	6660  Sun XT [Radeon HD 8670A/8670M/8690M]
+	665f  Tobago PRO [Radeon R7 360 / R9 360 OEM]
+		1028 0b04  Radeon R9 360 OEM
+		1462 2938  Radeon R9 360 OEM
+		1462 3271  Radeon R9 360 OEM
+		1682 7360  Radeon R7 360
+	6660  Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330]
+		17aa 3809  Radeon R5 M330
+		17aa 390c  Radeon R5 M330
 	6663  Sun PRO [Radeon HD 8570A/8570M]
 		1025 0846  Radeon HD 8570A
 	6664  Jet XT [Radeon R5 M240]
 	6665  Jet PRO [Radeon R5 M230]
+		17aa 368f  Radeon R5 A230
 	6667  Jet ULT [Radeon R5 M230]
 	666f  Sun LE [Radeon HD 8550M / R5 M230]
-	6670  Hainan
 	6704  Cayman PRO GL [FirePro V7900]
 	6707  Cayman LE GL [FirePro V5900]
 	6718  Cayman XT [Radeon HD 6970]
@@ -1515,8 +1560,6 @@
 		1558 5104  Radeon HD 6990M
 		1558 7201  Radeon HD 6990M
 		174b e188  Radeon HD 6970M
-	6724  Blackcomb [Mobility Radeon HD 6000 series]
-	6725  Blackcomb [Radeon HD 6900M Series]
 	6738  Barts XT [Radeon HD 6870]
 # HD-687A-ZDFC
 		1682 3103  Radeon HD 8670
@@ -1928,17 +1971,21 @@
 		17aa 3658  Radeon HD 7470A
 	6771  Caicos XTX [Radeon HD 8490 / R5 235X OEM]
 	6772  Caicos [Radeon HD 7450A]
-	6778  Caicos XT [Radeon HD 7470/8470 / R5 235 OEM]
+	6778  Caicos XT [Radeon HD 7470/8470 / R5 235/310 OEM]
 		1019 0024  Radeon HD 7470
 		1019 0027  Radeon HD 8470
 		1028 2120  Radeon HD 7470
 		1462 b491  Radeon HD 8470
 		1462 b492  Radeon HD 8470
 		1462 b493  Radeon HD 8470 OEM
+		1462 b499  Radeon R5 235 OEM
 		1642 3c65  Radeon HD 8470
 		1642 3c75  Radeon HD 8470
 		174b 8145  Radeon HD 8470
+		174b d145  Radeon R5 235 OEM
+		174b d335  Radeon R5 310 OEM
 		174b e145  Radeon HD 7470
+		17aa 3694  Radeon R5 A220
 	6779  Caicos [Radeon HD 6450/7450/8450 / R5 230 OEM]
 		1019 0016  Radeon HD 6450
 		1019 0017  Radeon HD 6450
@@ -1974,8 +2021,8 @@
 		1b0a 90bb  Radeon HD 7450A
 	677b  Caicos PRO [Radeon HD 7450]
 	6780  Tahiti XT GL [FirePro W9000]
-	6784  Tahiti [ATI FirePro V (FireGL V) Graphics Adapter]
-	6788  Tahiti [ATI FirePro V (FireGL V) Graphics Adapter]
+	6784  Tahiti [FirePro Series Graphics Adapter]
+	6788  Tahiti [FirePro Series Graphics Adapter]
 	678a  Tahiti PRO GL [FirePro Series]
 		1002 030c  FirePro W8000
 		1002 0310  FirePro S9000
@@ -1985,9 +2032,7 @@
 		1002 0b0e  FirePro S10000 Passive
 		1002 0b2a  FirePro S10000
 		1028 030c  FirePro W8000
-	6790  Tahiti
-	6791  Tahiti
-	6792  Tahiti
+		1028 0710  FirePro S9000
 	6798  Tahiti XT [Radeon HD 7970/8970 OEM / R9 280X]
 		1002 3000  Tahiti XT2 [Radeon HD 7970 GHz Edition]
 		1002 3001  Tahiti XTL [Radeon R9 280X]
@@ -2028,8 +2073,12 @@
 	679e  Tahiti LE [Radeon HD 7870 XT]
 	679f  Tahiti
 	67a0  Hawaii XT GL [FirePro W9100]
+		1002 0335  FirePro S9150
+		1028 031f  FirePro W9100
+		1028 0335  FirePro S9150
 	67a1  Hawaii PRO GL [FirePro W8100]
 		1002 0335  FirePro S9100
+		1028 0335  FirePro S9100
 	67a2  Hawaii GL
 	67a8  Hawaii
 	67a9  Hawaii
@@ -2072,22 +2121,38 @@
 		1002 0310  FirePro S7000
 		1002 0420  Radeon Sky 500
 	6809  Pitcairn LE GL [FirePro W5000]
-	6810  Curacao XT [Radeon R9 270X]
-	6811  Curacao PRO [Radeon R9 270]
+	6810  Curacao XT [Radeon R7 370 / R9 270X/370 OEM]
+		148c 0908  Radeon R9 370 OEM
+		1682 7370  Radeon R7 370
+	6811  Curacao PRO [Radeon R7 370 / R9 270/370 OEM]
+		1028 0b00  Trinidad PRO [Radeon R9 370 OEM]
+		1043 2016  Trinidad PRO [Radeon R9 370 OEM]
+		1458 2016  Trinidad PRO [Radeon R9 370 OEM]
+		1462 2016  Trinidad PRO [Radeon R9 370 OEM]
+		148c 2016  Trinidad PRO [Radeon R9 370 OEM]
+		1682 2015  Trinidad PRO [Radeon R7 370]
+		174b 2016  Trinidad PRO [Radeon R9 370 OEM]
+		1787 2016  Trinidad PRO [Radeon R9 370 OEM]
 	6816  Pitcairn
 	6817  Pitcairn
 	6818  Pitcairn XT [Radeon HD 7870 GHz Edition]
 		1002 0b05  Radeon HD 8870 OEM
 		174b 8b04  Radeon HD 8860
-	6819  Pitcairn PRO [Radeon HD 7850]
+	6819  Pitcairn PRO [Radeon HD 7850 / R7 265 / R9 270 1024SP]
+		1682 7269  Radeon R9 270 1024SP
+		1682 9278  Radeon R9 270 1024SP
+		174b a008  Radeon R9 270 1024SP
 		174b e221  Radeon HD 7850 2GB GDDR5 DVI-I/DVI-D/HDMI/DP
-	6820  Venus XTX [Radeon HD 8890M / R9 M275X]
+	6820  Venus XTX [Radeon HD 8890M / R9 M275X/M375X]
 		103c 1851  Radeon HD 7750M
+		17aa 3643  Radeon R9 A375
 		17aa 3801  Radeon R9 M275
-	6821  Venus XT [Radeon HD 8870M / R9 M270X]
+		17aa 3824  Radeon R9 M375
+	6821  Venus XT [Radeon HD 8870M / R9 M270X/M370X]
 		1002 031e  FirePro SX4000
 		1028 05cc  FirePro M5100
 		1028 15cc  FirePro M5100
+		106b 0149  Radeon R9 M370X Mac Edition
 	6822  Venus PRO [Radeon E8860]
 	6823  Venus PRO [Radeon HD 8850M / R9 M265X]
 	6825  Heathrow XT [Radeon HD 7870M]
@@ -2114,9 +2179,6 @@
 		1462 8092  Radeon HD 8730
 		148c 8730  Radeon HD 8730
 		1787 3000  Radeon HD 6570
-	6838  Cape Verde
-	6839  Cape Verde
-	683b  Cape Verde [Radeon HD 7700 Series]
 	683d  Cape Verde XT [Radeon HD 7770/8760 / R7 250X]
 		1002 0030  Radeon HD 8760 OEM
 		1019 0030  Radeon HD 8760 OEM
@@ -2124,7 +2186,10 @@
 		1043 8760  Radeon HD 8760 OEM
 		1462 2710  R7770-PMD1GD5
 		174b 8304  Radeon HD 8760 OEM
-	683f  Cape Verde PRO [Radeon HD 7750 / R7 250E]
+	683f  Cape Verde PRO [Radeon HD 7750/8740 / R7 250E]
+		1462 2790  Radeon HD 8740
+		1462 2791  Radeon HD 8740
+		1642 3b97  Radeon HD 8740
 	6840  Thames [Radeon HD 7500M/7600M Series]
 		1025 050e  Radeon HD 7670M
 		1025 050f  Radeon HD 7670M
@@ -2703,12 +2768,13 @@
 		1179 f903  Radeon R7 M260
 		1179 f934  Radeon R7 M260
 	6901  Topaz PRO [Radeon R5 M255]
-	6920  Tonga
 	6921  Amethyst XT [Radeon R9 M295X]
+	6929  Tonga XT GL [FirePro S7150]
 	692b  Tonga PRO GL [FirePro W7100]
-	692f  Tonga XT GL [FirePro W8100]
+	692f  Tonga XTV GL [FirePro S7150V]
 	6938  Amethyst XT [Radeon R9 M295X Mac Edition]
-	6939  Tonga PRO [Radeon R9 285]
+	6939  Tonga PRO [Radeon R9 285/380]
+		148c 9380  Radeon R9 380
 	700f  RS100 AGP Bridge
 	7010  RS200/RS250 AGP Bridge
 	7100  R520 [Radeon X1800 XT]
@@ -2829,6 +2895,11 @@
 	72a8  RV570 [Radeon X1950 GT] (Secondary)
 	72b1  RV560 [Radeon X1650 XT] (Secondary)
 	72b3  RV560 [Radeon X1650 GT] (Secondary)
+	7300  Fiji [Radeon R9 FURY / NANO Series]
+		1002 0b36  Radeon R9 FURY X / NANO
+		1043 049e  Radeon R9 FURY
+		1043 04a0  Radeon R9 FURY X
+		174b e329  Radeon R9 FURY
 	7833  RS350 Host Bridge
 	7834  RS350 [Radeon 9100 PRO/XT IGP]
 	7835  RS350M [Mobility Radeon 9000 IGP]
@@ -3075,12 +3146,7 @@
 	9837  Kabini [Radeon HD 8280E]
 	9838  Kabini [Radeon HD 8240 / R3 Series]
 	9839  Kabini [Radeon HD 8180]
-	983a  Kabini
-	983b  Kabini
-	983c  Kabini
 	983d  Temash [Radeon HD 8250/8280G]
-	983e  Kabini
-	983f  Kabini
 	9840  Kabini HDMI/DP Audio
 	9850  Mullins [Radeon R3 Graphics]
 	9851  Mullins [Radeon R4/R5 Graphics]
@@ -3100,10 +3166,12 @@
 	985f  Mullins
 	9874  Carrizo
 	9900  Trinity [Radeon HD 7660G]
+		103c 1985  Pavilion 17-e163sg Notebook PC
 # AMD A10-5800K CPU
 	9901  Trinity [Radeon HD 7660D]
 	9902  Trinity HDMI Audio Controller
 		103c 194e  ProBook 455 G1 Notebook
+		103c 1985  Pavilion 17-e163sg Notebook PC
 	9903  Trinity [Radeon HD 7640G]
 		103c 194e  ProBook 455 G1 Notebook
 		103c 1952  ProBook 455 G1 Notebook
@@ -3170,6 +3238,7 @@
 		174b aa98  Radeon HD 6450 1GB DDR3
 	aaa0  Tahiti XT HDMI Audio [Radeon HD 7970 Series]
 	aab0  Cape Verde/Pitcairn HDMI Audio [Radeon HD 7700/7800 Series]
+	aac8  Hawaii HDMI Audio
 	ac00  Theater 600 Pro
 	ac02  TV Wonder HD 600 PCIe
 	ac12  Theater HD T507 (DVB-T) TV tuner/capture device
@@ -3683,9 +3752,12 @@
 	1404  Family 15h (Models 10h-1fh) Processor Function 4
 	1405  Family 15h (Models 10h-1fh) Processor Function 5
 	1410  Family 15h (Models 10h-1fh) Processor Root Complex
+		103c 1985  Pavilion 17-e163sg Notebook PC
 	1412  Family 15h (Models 10h-1fh) Processor Root Port
+		1022 1234  Trinity A-series APU
 	1413  Family 15h (Models 10h-1fh) Processor Root Port
 	1414  Family 15h (Models 10h-1fh) Processor Root Port
+		1022 1234  Trinity A-series APU
 	1415  Family 15h (Models 10h-1fh) Processor Root Port
 	1416  Family 15h (Models 10h-1fh) Processor Root Port
 	1417  Family 15h (Models 10h-1fh) Processor Root Port
@@ -3701,6 +3773,7 @@
 	1423  Family 15h (Models 30h-3fh) I/O Memory Management Unit
 	1426  Family 15h (Models 30h-3fh) Processor Root Port
 	1439  Family 16h Processor Functions 5:1
+	145b  Zeppelin Non-Transparent Bridge
 	1510  Family 14h Processor Root Complex
 		174b 1001  PURE Fusion Mini
 	1512  Family 14h Processor Root Port
@@ -3846,27 +3919,34 @@
 	7802  FCH SATA Controller [RAID mode]
 	7803  FCH SATA Controller [RAID mode]
 	7804  FCH SATA Controller [AHCI mode]
+		103c 1985  Pavilion 17-e163sg Notebook PC
 	7805  FCH SATA Controller [RAID mode]
 	7806  FCH SD Flash Controller
 	7807  FCH USB OHCI Controller
 		103c 194e  ProBook 455 G1 Notebook
+		103c 1985  Pavilion 17-e163sg Notebook PC
 	7808  FCH USB EHCI Controller
 		103c 194e  ProBook 455 G1 Notebook
+		103c 1985  Pavilion 17-e163sg Notebook PC
 	7809  FCH USB OHCI Controller
 		103c 194e  ProBook 455 G1 Notebook
 	780b  FCH SMBus Controller
 		103c 194e  ProBook 455 G1 Notebook
+		103c 1985  Pavilion 17-e163sg Notebook PC
 	780c  FCH IDE Controller
 	780d  FCH Azalia Controller
 		103c 194e  ProBook 455 G1 Notebook
+		103c 1985  Pavilion 17-e163sg Notebook PC
 		1043 8444  F2A85-M Series
 	780e  FCH LPC Bridge
 		103c 194e  ProBook 455 G1 Notebook
+		103c 1985  Pavilion 17-e163sg Notebook PC
 	780f  FCH PCI Bridge
 	7812  FCH USB XHCI Controller
 	7813  FCH SD Flash Controller
 	7814  FCH USB XHCI Controller
 		103c 194e  ProBook 455 G1 Notebook
+		103c 1985  Pavilion 17-e163sg Notebook PC
 	7900  FCH SATA Controller [IDE mode]
 	7901  FCH SATA Controller [AHCI mode]
 	7902  FCH SATA Controller [RAID mode]
@@ -4085,6 +4165,7 @@
 		102b 2100  MGA-2164W Millennium II
 	051e  MGA 1064SG [Mystique] AGP
 	051f  MGA 2164W [Millennium II] AGP
+		102b 2100  MGA-2164WA [Millennium II A]
 	0520  MGA G200
 		102b dbc2  G200 Multi-Monitor
 		102b dbc8  G200 Multi-Monitor
@@ -4125,7 +4206,7 @@
 		102b f806  Mystique G200 Video AGP
 		102b ff00  MGA-G200 AGP
 		102b ff02  Mystique G200 AGP
-		102b ff03  Millennium G200 AGP
+		102b ff03  Millennium G200A AGP
 		102b ff04  Marvel G200 AGP
 		110a 0032  MGA-G200 AGP
 	0522  MGA G200e [Pilot] ServerEngines (SEP1)
@@ -4434,6 +4515,7 @@
 		103c 1293  USB add-in card
 		103c 1294  USB 2.0 add-in card
 		1179 0001  USB
+		1186 0035  DUB-C2 USB 2.0 2-port 32-bit cardbus controller
 		12ee 7000  Root Hub
 		14c2 0105  PTI-205N USB 2.0 Host Controller
 		1799 0001  Root Hub
@@ -4465,6 +4547,7 @@
 	00ce  uPD72871 [Firewarden] IEEE1394a OHCI 1.0 Link/1-port PHY Controller
 	00df  Vr4131
 	00e0  uPD72010x USB 2.0 Controller
+		1186 f100  DUB-C2 USB 2.0 2-port 32-bit cardbus controller
 		12ee 7001  Root hub
 		14c2 0205  PTI-205N USB 2.0 Host Controller
 		1799 0002  Root Hub
@@ -4480,6 +4563,7 @@
 		1028 04b2  Vostro 3350
 		1028 04da  Vostro 3750
 		1043 8413  P8P67 Deluxe Motherboard
+		104d 907a  Vaio VPCF1
 		1af4 1100  QEMU Virtual Machine
 		1b96 0001  USB 3.0 PCIe Card
 	01e7  uPD72873 [Firewarden] IEEE1394a OHCI 1.1 Link/2-port PHY Controller
@@ -4558,7 +4642,7 @@
 		1734 1099  D2030-A1 Motherboard
 	0900  SiS900 PCI Fast Ethernet
 		1019 0a14  K7S5A motherboard
-		1039 0900  SiS900 10/100 Ethernet Adapter onboard [Asus P4SC-EA]
+		1039 0900  SiS900 10/100 Ethernet Adapter onboard
 		1043 8035  CUSI-FX motherboard
 		1043 80a7  Motherboard P4S800D-X
 		1462 0900  MS-6701 motherboard
@@ -4640,7 +4724,7 @@
 		1019 0f05  A928 (i-Buddie)
 		1039 7012  SiS 7012 onboard [Asus P4SC-EA] AC'97 Sound Controller
 		1043 818f  A8S-X Motherboard
-		13f6 0300  CMI9739(A) on ECS K7SOM+ motherboard
+		13f6 0300  CMI9739(A) on ECS K7S series motherboard
 		1462 5850  MSI 648 Max (MS-6585)
 		1462 7010  MS-6701 motherboard
 		15bd 1001  DFI 661FX motherboard
@@ -4750,30 +4834,30 @@
 		103c 3212  Smart Array E200
 	3239  Smart Array Gen9 Controllers
 		103c 21bd  P244br
-		103c 21be  Smart Array
+		103c 21be  P741m
 		103c 21bf  H240ar
 		103c 21c0  P440ar
-		103c 21c1  Smart Array
+		103c 21c1  P840ar
 		103c 21c2  P440
 		103c 21c3  P441
 		103c 21c4  Smart Array
-		103c 21c5  Smart Array
+		103c 21c5  P841
 		103c 21c6  H244br
 		103c 21c7  H240
 		103c 21c8  H241
 		103c 21c9  Smart Array
-		103c 21ca  Smart Array
+		103c 21ca  P246br
 		103c 21cb  P840
 		103c 21cc  Smart Array
-		103c 21cd  Smart Array
-		103c 21ce  Smart Array
+		103c 21cd  P240nr
+		103c 21ce  H240nr
 	323a  Smart Array G6 controllers
 		103c 3241  Smart Array P212
 		103c 3243  Smart Array P410
 		103c 3245  Smart Array P410i
 		103c 3247  Smart Array P411
 		103c 3249  Smart Array P812
-		103c 324a  HP Smart Array 712m (Mezzanine RAID controller)
+		103c 324a  Smart Array 712m (Mezzanine RAID controller)
 		103c 324b  Smart Array P711m (Mezzanine RAID controller)
 	323b  Smart Array Gen8 Controllers
 		103c 3350  P222
@@ -5054,16 +5138,19 @@
 	802e  PCI7x20 1394a-2000 OHCI Two-Port PHY/Link-Layer Controller
 		1028 018d  Inspiron 700m/710m
 	8031  PCIxx21/x515 Cardbus Controller
+		1025 0064  Extensa 3000 series laptop
 		1025 0080  Aspire 5024WLMi
 		103c 0934  Compaq nw8240/nx8220
 		103c 099c  NX6110/NC6120
 		103c 308b  MX6125
 	8032  OHCI Compliant IEEE 1394 Host Controller
+		1025 0064  Extensa 3000 series laptop
 		1025 0080  Aspire 5024WLMi
 		103c 0934  Compaq nw8240/nx8220
 		103c 099c  NX6110/NC6120
 		103c 308b  MX6125
 	8033  PCIxx21 Integrated FlashMedia Controller
+		1025 0064  Extensa 3000 series laptop
 		1025 0080  Aspire 5024WLMi
 		103c 0934  Compaq nw8240/nx8220
 		103c 099c  NX6110/NC6120
@@ -5652,6 +5739,7 @@
 	0074  U4 HT Bridge
 # should be 14e4:1645
 	1645  Broadcom NetXtreme BCM5701 Gigabit Ethernet
+	2001  PCI Express SSD
 106c  Hynix Semiconductor
 	8139  8139c 100BaseTX Ethernet Controller
 	8801  Dual Pentium ISA/PCI Motherboard
@@ -5708,8 +5796,13 @@
 		101e 8493  QLA12160 on AMI MegaRAID
 	1240  ISP1240 SCSI Host Adapter
 	1280  ISP1280 SCSI Host Adapter
+	1634  FastLinQ QL45000 Series 40GbE Controller
+	1656  FastLinQ QL45000 Series 25GbE Controller
+	165e  FastLinQ QL45000 Series 100GbE Controller
+	1664  FastLinQ QL45000 Series Gigabit Ethernet Controller (SR-IOV VF)
 	2020  ISP2020A Fast!SCSI Basic Adapter
 	2031  ISP8324-based 16Gb Fibre Channel to PCI Express Adapter
+		103c 8002  3830C 16G Fibre Channel Host Bus Adapter
 	2100  QLA2100 64-bit Fibre Channel Adapter
 		1077 0001  QLA2100 64-bit Fibre Channel Adapter
 	2200  QLA2200 64-bit Fibre Channel Adapter
@@ -5749,6 +5842,7 @@
 		1077 020c  3200 Series Quad Port 1Gb Intelligent Ethernet Adapter
 		1077 020f  3200 Series Single Port 10Gb Intelligent Ethernet Adapter
 		1077 0210  QME8242-k 10GbE Dual Port Mezzanine Card
+		1077 0233  QME8262-k 10GbE Dual Port Mezzanine Card
 	8021  8200 Series 10GbE Converged Network Adapter (FCoE)
 		103c 3348  CN1000Q Dual Port Converged Network Adapter
 		1077 0211  QME8242-k 10GbE Dual Port Mezzanine Card, FCoE
@@ -7156,6 +7250,8 @@
 		1517 000f  ECDR-GC314-PMC Receiver
 		1885 0700  Tsunami FPGA PMC with Altera Stratix S40
 		1885 0701  Tsunami FPGA PMC with Altera Stratix S30
+	9733  PEX 9733 33-lane, 9-port PCI Express Gen 3 (8.0 GT/s) Switch
+	9749  PEX 9749 49-lane, 13-port PCI Express Gen 3 (8.0 GT/s) Switch
 	a100  Blackmagic Design DeckLink
 	bb04  B&B 3PCIOSD1A Isolated PCI Serial
 	c001  CronyxOmega-PCI (8-port RS232)
@@ -7546,8 +7642,8 @@
 10cd  Advanced System Products, Inc
 	1100  ASC1100
 	1200  ASC1200 [(abp940) Fast SCSI-II]
-	1300  ABP940-U / ABP960-U
-		10cd 1310  ASC1300 SCSI Adapter
+	1300  ASC1300 / ASC3030 [ABP940-U / ABP960-U / ABP3925]
+		10cd 1310  ASC1300/3030 SCSI adapter
 		1195 1320  Ultra-SCSI CardBus PC Card REX CB31
 	2300  ABP940-UW
 	2500  ABP940-U2W
@@ -7883,6 +7979,7 @@
 	00c9  NV41M [GeForce Go 6800 Ultra]
 	00cc  NV41GLM [Quadro FX Go1400]
 	00cd  NV42GL [Quadro FX 3450/4000 SDI]
+		10de 029b  Quadro FX 3450
 	00ce  NV41GL [Quadro FX 1400]
 	00cf  NV41
 	00d0  nForce3 LPC Bridge
@@ -8155,6 +8252,7 @@
 	01d2  G72 [GeForce 7550 LE]
 	01d3  G72 [GeForce 7200 GS / 7300 SE]
 		1043 8203  EN7300SE
+		1043 8250  EN7200GS
 	01d5  G72
 	01d6  G72M [GeForce Go 7200]
 	01d7  G72M [Quadro NVS 110M/GeForce Go 7300]
@@ -8784,15 +8882,20 @@
 		1849 0569  K10N78FullHD-hSLI R3.0 PCI Express Bridge
 	056a  MCP73 [nForce 630i] USB 2.0 Controller (EHCI)
 		1019 297a  MCP73PVT-SM
-	056c  MCP73 IDE
+		147b 1c3e  I-N73V motherboard
+	056c  MCP73 IDE Controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
 	056d  MCP73 PCI Express bridge
 		1019 297a  MCP73PVT-SM
+		10de cb73  MCP73 PCI Bridge
 	056e  MCP73 PCI Express bridge
 		1019 297a  MCP73PVT-SM
+		10de 0000  MCP73 PCIe x16 port
 	056f  MCP73 PCI Express bridge
 		1019 297a  MCP73PVT-SM
+		10de 0000  MCP73 PCIe x1 port
 	05b1  NF200 PCIe 2.0 switch
 	05b8  NF200 PCIe 2.0 switch for GTX 295
 	05be  NF200 PCIe 2.0 switch for Quadro Plex S4 / Tesla S870 / Tesla S1070 / Tesla S2050
@@ -8892,6 +8995,7 @@
 	0642  G96 [D9M-10]
 	0643  G96 [GeForce 9500 GT]
 	0644  G96 [GeForce 9500 GS]
+		174b 9600  Geforce 9500GS 512M DDR2 V/D/HDMI
 	0645  G96 [GeForce 9500 GS]
 	0646  G96 [GeForce GT 120]
 	0647  G96M [GeForce 9600M GT]
@@ -8951,6 +9055,7 @@
 		10de 084d  Tesla M2070-Q
 		10de 087f  Tesla M2070-Q
 	06e0  G98 [GeForce 9300 GE]
+		107d 5a96  Geforce 9300GE
 	06e1  G98 [GeForce 9300 GS]
 	06e2  G98 [GeForce 8400]
 	06e3  G98 [GeForce 8300 GS]
@@ -9065,49 +9170,65 @@
 	07c1  MCP73 Host Bridge
 		1019 297a  MCP73PVT-SM
 	07c2  MCP73 Host Bridge
+	07c3  MCP73 Host Bridge
+		147b 1c3e  I-N73V motherboard
 	07c5  MCP73 Host Bridge
 	07c8  MCP73 Memory Controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
-	07cb  nForce 630i memory controller
+	07cb  nForce 610i/630i memory controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
-	07cd  nForce 630i memory controller
+	07cd  nForce 610i/630i memory controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
-	07ce  nForce 630i memory controller
+	07ce  nForce 610i/630i memory controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
-	07cf  nForce 630i memory controller
+	07cf  nForce 610i/630i memory controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
-	07d0  nForce 630i memory controller
+	07d0  nForce 610i/630i memory controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
-	07d1  nForce 630i memory controller
+	07d1  nForce 610i/630i memory controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
-	07d2  nForce 630i memory controller
+	07d2  nForce 610i/630i memory controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
-	07d3  nForce 630i memory controller
+	07d3  nForce 610i/630i memory controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
-	07d6  nForce 630i memory controller
+	07d6  nForce 610i/630i memory controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
 	07d7  MCP73 LPC Bridge
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
 	07d8  MCP73 SMBus
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
 	07d9  MCP73 Memory Controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
 	07da  MCP73 Co-processor
 		1afa 7150  JW-IN7150-HD
 	07dc  MCP73 Ethernet
+		147b 1c3e  I-N73V motherboard
 	07dd  MCP73 Ethernet
 	07de  MCP73 Ethernet
 	07df  MCP73 Ethernet
@@ -9117,16 +9238,22 @@
 		1019 297a  MCP73PVT-SM
 	07e2  C73 [GeForce 7050 / nForce 630i]
 	07e3  C73 [GeForce 7050 / nForce 610i]
+		147b 1c3e  I-N73V motherboard
 	07e5  C73 [GeForce 7100 / nForce 620i]
-	07f0  MCP73 IDE
+	07f0  MCP73 SATA Controller (IDE mode)
+		147b 1c3e  I-N73V motherboard
 	07f4  GeForce 7100/nForce 630i SATA
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 	07f8  MCP73 SATA RAID Controller
+		147b 1c3e  I-N73V motherboard
 	07fc  MCP73 High Definition Audio
 		1019 297a  MCP73PVT-SM
 		10de 07fc  MCP73 High Definition Audio
-	07fe  GeForce 7100/nForce 630i USB
+		147b 1c3e  I-N73V motherboard
+	07fe  MCP73 OHCI USB 1.1 Controller
 		1019 297a  MCP73PVT-SM
+		147b 1c3e  I-N73V motherboard
 		1afa 7150  JW-IN7150-HD
 	0840  C77 [GeForce 8200M]
 	0844  C77 [GeForce 9100M G]
@@ -9210,6 +9337,7 @@
 	0a64  GT218 [ION]
 	0a65  GT218 [GeForce 210]
 		1043 8334  EN210 SILENT
+		1462 8094  N210 [Geforce 210] PCIe graphics adapter
 	0a66  GT218 [GeForce 310]
 	0a67  GT218 [GeForce 315]
 	0a68  GT218M [GeForce G 105M]
@@ -9363,6 +9491,7 @@
 	0be3  High Definition Audio Controller
 		1028 040b  Latitude E6510
 		10de 066d  G98 [GeForce 8400GS]
+		1462 8094  N210 [Geforce 210] PCIe graphics adapter
 	0be4  High Definition Audio Controller
 	0be5  GF100 High Definition Audio Controller
 	0be9  GF106 High Definition Audio Controller
@@ -9496,6 +9625,7 @@
 	0fc6  GK107 [GeForce GTX 650]
 		1043 8428  GTX650-DC-1GD5
 	0fc8  GK107 [GeForce GT 740]
+	0fc9  GK107 [GeForce GT 730]
 	0fcd  GK107M [GeForce GT 755M]
 	0fce  GK107M [GeForce GT 640M LE]
 	0fd1  GK107M [GeForce GT 650M]
@@ -9530,6 +9660,8 @@
 		10de 101e  GRID K100
 	0fe9  GK107M [GeForce GT 750M Mac Edition]
 	0fea  GK107M [GeForce GT 755M Mac Edition]
+	0fec  GK107M [GeForce 710A]
+	0fed  GK107M [GeForce 820M]
 	0fef  GK107GL [GRID K340]
 	0ff1  GK107 [NVS 1000]
 	0ff2  GK107GL [GRID K1]
@@ -9578,6 +9710,7 @@
 	1021  GK110GL [Tesla K20Xm]
 	1022  GK110GL [Tesla K20c]
 	1023  GK110BGL [Tesla K40m]
+		10de 097e  12GB Computational Accelerator
 	1024  GK110BGL [Tesla K40c]
 	1026  GK110GL [Tesla K20s]
 	1027  GK110BGL [Tesla K40st]
@@ -9707,6 +9840,7 @@
 		1025 0856  GeForce 820M
 		1025 0857  GeForce 820M
 		1025 0858  GeForce 820M
+		1025 0863  GeForce 820M
 		1025 0868  GeForce 820M
 		1025 0869  GeForce 810M
 		1025 0873  GeForce 820M
@@ -9720,6 +9854,7 @@
 		1025 0921  GeForce 820M
 		1025 092e  GeForce 810M
 		1025 092f  GeForce 820M
+		1025 0932  GeForce 820M
 		1025 093a  GeForce 820M
 		1025 093c  GeForce 820M
 		1025 093f  GeForce 820M
@@ -10028,9 +10163,11 @@
 	11c3  GK106 [GeForce GTX 650 Ti OEM]
 		10de 1030  GeForce GTX 650 Ti OEM
 	11c4  GK106 [GeForce GTX 645 OEM]
+	11c5  GK106 [GeForce GT 740]
 	11c6  GK106 [GeForce GTX 650 Ti]
 	11c7  GK106 [GeForce GTX 750 Ti]
 	11c8  GK106 [GeForce GTX 650 OEM]
+	11cb  GK106 [GeForce GT 740]
 	11e0  GK106M [GeForce GTX 770M]
 	11e1  GK106M [GeForce GTX 765M]
 	11e2  GK106M [GeForce GTX 765M]
@@ -10090,6 +10227,7 @@
 	1286  GK208 [GeForce GT 720]
 	1287  GK208 [GeForce GT 730]
 	1288  GK208 [GeForce GT 720]
+	1289  GK208 [GeForce GT 710]
 	1290  GK208M [GeForce GT 730M]
 		103c 2afa  GeForce GT 730A
 		103c 2b04  GeForce GT 730A
@@ -10114,6 +10252,7 @@
 	1296  GK208M [GeForce 825M]
 	1298  GK208M [GeForce GT 720M]
 	1299  GK208M [GeForce 920M]
+	129a  GK208M [GeForce 910M]
 	12a0  GK208
 	12b9  GK208GLM [Quadro K610M]
 	12ba  GK208GLM [Quadro K510M]
@@ -10123,8 +10262,11 @@
 		17aa 3697  GeForce 840A
 		17aa 3699  GeForce 840A
 		17aa 369c  GeForce 840A
+	1344  GM108M [GeForce 845M]
 	1346  GM108M [GeForce 930M]
 	1347  GM108M [GeForce 940M]
+	137a  GM108GLM [Quadro K620M]
+	137d  GM108M [GeForce 940A]
 	1380  GM107 [GeForce GTX 750 Ti]
 	1381  GM107 [GeForce GTX 750]
 	1382  GM107 [GeForce GTX 745]
@@ -10139,7 +10281,9 @@
 	139a  GM107M [GeForce GTX 950M]
 	139b  GM107M [GeForce GTX 960M]
 	139c  GM107M [GeForce 940M]
-	13b0  GM107GLM [N16P-Q3]
+	13b0  GM107GLM [Quadro M2000M]
+	13b1  GM107GLM [Quadro M1000M]
+	13b2  GM107GLM [Quadro M600M]
 	13b3  GM107GLM [Quadro K2200M]
 	13ba  GM107GL [Quadro K2200]
 	13bb  GM107GL [Quadro K620]
@@ -10153,11 +10297,27 @@
 	13d7  GM204M [GeForce GTX 980M]
 	13d8  GM204M [GeForce GTX 970M]
 	13d9  GM204M [GeForce GTX 965M]
+	13f0  GM204GL [Quadro M5000]
+	13f1  GM204GL [Quadro M4000]
+	13f2  GM204GL [Tesla M60]
+	13f8  GM204GLM [Quadro M5000M]
+	13f9  GM204GLM [Quadro M4000M]
+	13fa  GM204GLM [Quadro M3000M]
 	1401  GM206 [GeForce GTX 960]
+	1402  GM206 [GeForce GTX 950]
+	1617  GM204M [GeForce GTX 980M]
+	1618  GM204M [GeForce GTX 970M]
+	1619  GM204M [GeForce GTX 965M]
 	17c2  GM200 [GeForce GTX TITAN X]
+	17c8  GM200 [GeForce GTX 980 Ti]
 	17f0  GM200GL [Quadro M6000]
 10df  Emulex Corporation
 	0720  OneConnect NIC (Skyhawk)
+		103c 1934  FlexFabric 20Gb 2-port 650M Adapter
+		103c 1935  FlexFabric 20Gb 2-port 650FLB Adapter
+		103c 21d4  StoreFabric CN1200E 10Gb Converged Network Adapter
+		103c 220a  FlexFabric 10Gb 2-port 556FLR-SFP+ Adapter
+		103c 803f  Ethernet 10Gb 2-port 557SFP+ Adapter
 		17aa 1056  ThinkServer OCm14102-UX-L AnyFabric
 		17aa 1057  ThinkServer OCm14104-UX-L AnyFabric
 		17aa 1059  ThinkServer OCm14104-UT-L AnyFabric
@@ -10310,6 +10470,7 @@
 	5229  RTS5229 PCI Express Card Reader
 		1025 0813  Aspire R7-571
 		103c 194e  ProBook 455 G1 Notebook
+		103c 1985  Pavilion 17-e163sg Notebook PC
 	5249  RTS5249 PCI Express Card Reader
 		103c 1909  ZBook 15
 	5288  RTS5288 PCI Express Card Reader
@@ -10325,11 +10486,12 @@
 	8129  RTL-8129
 		10ec 8129  RT8129 Fast Ethernet Adapter
 		11ec 8129  RTL8111/8168 PCIe Gigabit Ethernet (misconfigured)
-	8136  RTL8101E/RTL8102E PCI Express Fast Ethernet controller
+	8136  RTL8101/2/6E PCI Express Fast/Gigabit Ethernet controller
+		103c 1985  Pavilion 17-e163sg Notebook PC
 		103c 2ab1  Pavilion p6774
 		103c 30cc  Pavilion dv6700
 		1179 ff64  RTL8102E PCI-E Fast Ethernet NIC
-		17c0 1053  AzureWave AW-NE766 802.11B/G/N Mini PCIe Card Model RT2700E
+		17c0 1053  RTL8101e Medion WIM 2210 Notebook PC [MD96850]
 	8138  RT8139 (B/C) Cardbus Fast Ethernet Adapter
 		10ec 8138  RT8139 (B/C) Fast Ethernet Adapter
 	8139  RTL-8100/8101L/8139 PCI Fast Ethernet Adapter
@@ -10347,6 +10509,7 @@
 		10ec 8139  RTL-8100/8101L/8139 PCI Fast Ethernet Adapter
 		10f7 8338  Panasonic CF-Y5 laptop
 		1113 ec01  LevelOne FNC-0107TX/FNC-0109TX
+		1186 1104  DFE-520TX Fast Ethernet PCI Adapter (rev. D1)
 		1186 1300  DFE-538TX
 		1186 1320  SN5200
 		1186 8139  DRN-32TX
@@ -10467,7 +10630,6 @@
 	0405  Wildcard TE405P (2nd Gen)
 	0410  Wildcard TE410P (2nd Gen)
 	0600  Xilinx 6 Designs (Xilinx IP)
-	2b00  Zomojo Zcard
 	3fc0  RME Digi96
 	3fc1  RME Digi96/8
 	3fc2  RME Digi96/8 Pro
@@ -10620,8 +10782,11 @@
 	0620  RocketRAID 620 2 Port SATA-III Controller
 	0622  RocketRAID 622 2 Port SATA-III Controller
 	0640  RocketRAID 640 4 Port SATA-III Controller
+	0641  RocketRAID 640L 4 Port SATA-III Controller
+	0642  RocketRAID 642L SATA-III Controller (2 eSATA ports + 2 internal SATA ports)
 	0644  RocketRAID 644 4 Port SATA-III Controller (eSATA)
 	0645  RocketRAID 644L 4 Port SATA-III Controller (eSATA)
+	0646  RocketRAID 644LS SATA-III Controller (4 eSATA devices connected by 1 SAS cable)
 	1720  RocketRAID 1720 (2x SATA II RAID Controller)
 	1740  RocketRAID 1740
 	1742  RocketRAID 1742
@@ -10658,6 +10823,8 @@
 		127d 0000  CineView II
 	8485  EM8485 REALmagic DVD/MPEG-4 A/V Decoder
 	8486  EM8486 REALmagic DVD/MPEG-4 A/V Decoder
+# Found in Cisco DMP-4305G
+	c621  EM8621L Digital Media Processor
 	c622  EM8622L MPEG-4.10 (H.264) and SMPTE 421M (VC-1) A/V Decoder
 1106  VIA Technologies, Inc.
 	0102  Embedded VIA Ethernet Controller
@@ -10819,9 +10986,8 @@
 	287d  VT8251 PCIE Root Port
 	287e  VT8237/8251 Ultra VLINK Controller
 	3022  CLE266
-	3038  VT82xxxxx UHCI USB 1.1 Controller
-# possibly Hewlett-Packard D9840-60001 [Brio BA410 Motherboard]
-		0925 1234  VA-502 Mainboard
+	3038  VT82xx/62xx UHCI USB 1.1 Controller
+		0925 1234  onboard UHCI USB 1.1 Controller
 		1019 0985  P6VXA Motherboard
 		1019 0a81  L7VTA v1.0 Motherboard (KT400-8235)
 		1043 8080  A7V333 motherboard
@@ -10845,7 +11011,7 @@
 	3043  VT86C100A [Rhine]
 		10bd 0000  VT86C100A Fast Ethernet Adapter
 		1106 0100  VT86C100A Fast Ethernet Adapter
-		1186 1400  DFE-530TX rev A
+		1186 1400  DFE-530TX PCI Fast Ethernet Adapter (rev. A)
 	3044  VT6306/7/8 [Fire II(M)] IEEE 1394 OHCI Controller
 		0010 0001  IEEE 1394 4port DCST 1394-3+1B
 		1025 005a  TravelMate 290
@@ -10862,6 +11028,7 @@
 	3050  VT82C596 Power Management
 	3051  VT82C596 Power Management
 	3053  VT6105M [Rhine-III]
+		1186 1404  DFE-530TX PCI Fast Ethernet Adapter (rev. D)
 	3057  VT82C686 [Apollo Super ACPI]
 		1019 0985  P6VXA Motherboard
 		1019 0987  K7VZA Motherboard
@@ -10884,9 +11051,11 @@
 		1462 3091  MS-6309 Onboard Audio
 		1462 3092  MS-6309 v2.x Mainboard (VIA VT1611A codec)
 		1462 3300  MS-6330 Onboard Audio
+		1462 3400  MS-6340 (VT8363) motherboard
 		15dd 7609  Onboard Audio
 	3059  VT8233/A/8235/8237 AC97 Audio Controller
 		1019 0a81  L7VTA v1.0 Motherboard (KT400-8235)
+		1019 1841  M811 (VT8367/VT8235/VT6103) [KT333] motherboard
 		1019 1877  K8M800-M2 (V2.0) onboard audio
 		1043 8095  A7V8X Motherboard (Realtek ALC650 codec)
 		1043 80a1  A7V8X-X Motherboard
@@ -10906,7 +11075,7 @@
 		1462 5901  KT6 Delta-FIS2R (MS-6590)
 		1462 7181  K8MM3-V mainboard
 		147b 1407  KV8-MAX3 motherboard
-		1695 300c  EP-8KRA2+ Mainboard
+		1695 300c  Realtek ALC655 audio on EP-8KRA series mainboard
 		1849 0850  ASRock 775Dual-880 Pro onboard audio (Realtek ALC850)
 		1849 9739  P4VT8 Mainboard (C-Media CMI9739A codec)
 # probably all K7VT2/4*/6
@@ -10914,18 +11083,18 @@
 		4005 4710  MSI K7T266 Pro2-RU (MSI-6380 v2) onboard audio (Realtek/ALC 200/200P)
 		a0a0 01b6  AK77-8XN onboard audio
 		a0a0 0342  AK86-L motherboard
-	3065  VT6102 [Rhine-II]
+	3065  VT6102/VT6103 [Rhine-II]
 		1043 80a1  A7V8X-X Motherboard
 		1043 80ed  A7V600-X Motherboard
-		1106 0102  VT6102 [Rhine II] Embeded Ethernet Controller on VT8235
-		1186 1400  DFE-530TX rev A
-		1186 1401  DFE-530TX rev B
+		1106 0102  VT6102/6103 [Rhine II] Ethernet Controller
+		1186 1400  DFE-530TX PCI Fast Ethernet Adapter (rev. A)
+		1186 1401  DFE-530TX PCI Fast Ethernet Adapter (rev. B)
+		1186 1402  DFE-530TX PCI Fast Ethernet Adapter (rev. B)
 		13b9 1421  LD-10/100AL PCI Fast Ethernet Adapter (rev.B)
 		1462 7061  MS-7061
 		1462 7181  K8MM3-V mainboard
 		147b 1c09  NV7 Motherboard
 		1695 3005  VT6103
-		1695 300c  Realtek ALC655 sound chip
 # probably all K7VT2/4*/6
 		1849 3065  K7VT series Motherboards
 # This hosts more than just the Intel 537 codec, it also hosts PCtel (SIL33) and SmartLink (SIL34) codecs
@@ -10935,6 +11104,7 @@
 		1043 8052  VT8233A
 	3091  VT8633 [Apollo Pro266]
 	3099  VT8366/A/7 [Apollo KT266/A/333]
+		1019 1841  M811 (VT8367/VT8235/VT6103) [KT333] motherboard
 		1043 8064  A7V266-E Mainboard
 		1043 807f  A7V333 Mainboard
 		1849 3099  K7VT2 motherboard
@@ -10942,6 +11112,7 @@
 	3102  VT8662 Host Bridge
 	3103  VT8615 Host Bridge
 	3104  USB 2.0
+		0925 1234  onboard EHCI USB 2.0 Controller
 		1019 0a81  L7VTA v1.0 Motherboard (KT400-8235)
 		1043 808c  A7V8X motherboard
 		1043 80a1  A7V8X-X motherboard rev 1.01
@@ -10961,7 +11132,7 @@
 		19da a179  ZBOX nano VD01
 	3106  VT6105/VT6106S [Rhine-III]
 		1106 0105  VT6106S [Rhine-III]
-		1186 1403  DFE-530TX rev C
+		1186 1403  DFE-530TX PCI Fast Ethernet Adapter (rev. C)
 		1186 1405  DFE-520TX Fast Ethernet PCI Adapter
 		1186 1406  DFE-530TX+ rev F2
 		1186 1407  DFE-538TX
@@ -11001,6 +11172,7 @@
 		1849 3168  P4VT8 Mainboard
 	3177  VT8235 ISA Bridge
 		1019 0a81  L7VTA v1.0 Motherboard (KT400-8235)
+		1019 1841  M811 (VT8367/VT8235/VT6103) [KT333] motherboard
 		1043 808c  A7V8X motherboard
 		1043 80a1  A7V8X-X motherboard
 		1106 0000  KT4AV motherboard
@@ -11080,6 +11252,7 @@
 	3432  VL80x xHCI USB 3.0 Controller
 	3456  VX11 Standard Host Bridge
 	345b  VX11 Miscellaneous Bus
+	3483  VL805 USB 3.0 Host Controller
 	3a01  VX11 Graphics [Chrome 645/640]
 	4149  VIA VT6420 (ATA133) Controller
 	4204  K8M800 Host Bridge
@@ -11479,6 +11652,8 @@
 		1093 7602  PXIe-8384
 # 32 port / 8 lane PCIe Gen 2 packet switch
 	808f  PES32NT8AG2
+	80cf  F32P08xG3 [PCIe boot mode]
+	80d2  F32P08xG3 NVMe controller
 111e  Eldec
 111f  Precision Digital Images
 	4a47  Precision MX Video engine interface
@@ -12483,7 +12658,10 @@
 	3a11  AirXpert DWL-AG520 Wireless PCI Adapter(rev.B)
 	4000  DL2000-based Gigabit Ethernet
 	4001  DGE-550SX PCI-X Gigabit Ethernet Adapter
+	4200  DFE-520TX Fast Ethernet PCI Adapter
+		1186 1103  DFE-520TX Fast Ethernet PCI Adapter (rev. C1)
 	4300  DGE-528T Gigabit Ethernet Adapter
+		1186 4300  DGE-528T PCI Gigabit Ethernet Adapter
 # rev. B1; RealTek RTL8168E.
 		1186 4b10  DGE-560T PCI Express (x1) Gigabit Ethernet Adapter
 	4302  DGE-530T Gigabit Ethernet Adapter (rev.C1) [Realtek RTL8169]
@@ -12558,7 +12736,6 @@
 1198  Lambda Systems Inc
 1199  Attachmate Corporation
 	0101  Advanced ISCA/PCI Adapter
-	6832  Sierra Wireless MC8780 Device
 119a  Mind Share, Inc.
 119b  Omega Micro Inc.
 	1221  82C092G
@@ -12613,6 +12790,7 @@
 	2a43  88W8366 [TopDog] 802.11n Wireless
 	2a55  88W8864 [Avastar] 802.11ac Wireless
 	2b36  88W8764 [Avastar] 802.11n Wireless
+	2b38  88W8897 [AVASTAR] 802.11ac Wireless
 	4101  OLPC Cafe Controller Secure Digital Controller
 	4320  88E8001 Gigabit Ethernet Controller
 		1019 0f38  Marvell 88E8001 Gigabit Ethernet Controller (ECS)
@@ -13403,7 +13581,9 @@
 	0800  C4 ISDN
 	0a00  A1 ISDN [Fritz]
 		1244 0a00  FRITZ!Card ISDN Controller
-	0e00  Fritz!PCI v2.0 ISDN
+	0e00  Fritz!Card PCI v2.0 ISDN
+	0e80  Fritz!Card PCI v2.1 ISDN
+		1244 0e00  PSB 3100F (AVM KAFKA) [Fritz!Card PCI v2.1]
 	1100  C2 ISDN
 	1200  T1 ISDN
 	2700  Fritz!Card DSL SL
@@ -13579,6 +13759,7 @@
 	0718  SM718 LynxSE+
 	0720  SM720 Lynx3DM
 	0730  SM731 Cougar3DR
+	0750  SM750
 	0810  SM810 LynxE
 	0811  SM811 LynxE
 	0820  SM820 Lynx3D
@@ -13589,14 +13770,14 @@
 1273  Hughes Network Systems
 	0002  DirecPC
 1274  Ensoniq
-	1171  ES1373 [AudioPCI] (also Creative Labs CT5803)
-	1371  ES1371 / Creative Labs CT2518 [AudioPCI-97]
+	1171  ES1373 / Creative Labs CT5803 [AudioPCI]
+	1371  ES1371 / Creative Labs CT2518/ES1373
 		0e11 0024  AudioPCI on Motherboard Compaq Deskpro
 		0e11 b1a7  ES1371, ES1373 AudioPCI
 		1033 80ac  ES1371, ES1373 AudioPCI
 		1042 1854  Tazer
 		107b 8054  Tabor2
-		1274 1371  AudioPCI 64V/128 / Creative Sound Blaster CT4810
+		1274 1371  AudioPCI 64V/128 / Creative CT4810/CT5803/CT5806 [Sound Blaster PCI]
 		1274 8001  CT4751 board
 		1462 6470  ES1371, ES1373 AudioPCI On Motherboard MS-6147 1.1A
 		1462 6560  ES1371, ES1373 AudioPCI On Motherboard MS-6156 1.10
@@ -13647,10 +13828,10 @@
 		8086 5643  ES1371, ES1373 AudioPCI On Motherboard Vancouver
 		8086 5753  ES1371, ES1373 AudioPCI On Motherboard WS440BX
 	5000  ES1370 [AudioPCI]
-	5880  5880B [AudioPCI]
-		1274 2000  Creative Sound Blaster AudioPCI128
+	5880  5880B / Creative Labs CT5880
+		1274 2000  Creative CT4810 [Sound Blaster AudioPCI 128]
 		1274 2003  Creative SoundBlaster AudioPCI 128
-		1274 5880  Creative Sound Blaster AudioPCI128
+		1274 5880  Creative CT4750 [Sound Blaster PCI 128]
 		1274 8001  Sound Blaster 16PCI 4.1ch
 		1458 a000  5880 AudioPCI On Motherboard 6OXET
 		1462 6880  5880 AudioPCI On Motherboard MS-6188 1.00
@@ -13819,6 +14000,7 @@
 	8872  IT8874F PCI Dual Serial Port Controller
 	8888  IT8888F/G PCI to ISA Bridge with SMB [Golden Gate]
 	8889  IT8889F PCI to ISA Bridge
+	8893  IT8893E PCIe to PCI Bridge
 	e886  IT8330G
 1284  Sahara Networks, Inc.
 1285  Platform Technologies, Inc.
@@ -15014,7 +15196,7 @@
 	7168  PCI2S550 (Dual 16550 UART)
 		1409 0002  SER4036A3V (2x RS232 port)
 		1409 4027  SER4027A (1x RS232 port)
-		1409 4037  SER4037A (2x RS232 port)
+		1409 4037  SER4037A(L) [SUNIX SUN1889] (2x RS232 port)
 # Single DC-37 connector
 		1409 4056  SER4056A (4x RS232)
 		1409 5027  SER4027D
@@ -15313,6 +15495,8 @@
 	5013  T580-CHR Unified Wire Ethernet Controller
 	5014  T580-LP-SO-CR Unified Wire Ethernet Controller
 	5015  T502-BT Unified Wire Ethernet Controller
+	5016  T580-OCP-SO Unified Wire Ethernet Controller
+	5017  T520-OCP-SO Unified Wire Ethernet Controller
 	5080  T540-5080 Unified Wire Ethernet Controller
 	5081  T540-5081 Unified Wire Ethernet Controller
 	5082  T504-5082 Unified Wire Ethernet Controller
@@ -15324,6 +15508,13 @@
 	5088  T570-5088 Unified Wire Ethernet Controller
 	5089  T520-5089 Unified Wire Ethernet Controller
 	5090  T540-5090 Unified Wire Ethernet Controller
+	5091  T522-5091 Unified Wire Ethernet Controller
+	5092  T520-5092 Unified Wire Ethernet Controller
+	5093  T580-5093 Unified Wire Ethernet Controller
+	5094  T540-5094 Unified Wire Ethernet Controller
+	5095  T540-5095 Unified Wire Ethernet Controller
+	5096  T580-5096 Unified Wire Ethernet Controller
+	5097  T520-5097 Unified Wire Ethernet Controller
 	5401  T520-CR Unified Wire Ethernet Controller
 	5402  T522-CR Unified Wire Ethernet Controller
 	5403  T540-CR Unified Wire Ethernet Controller
@@ -15345,6 +15536,8 @@
 	5413  T580-CHR Unified Wire Ethernet Controller
 	5414  T580-LP-SO-CR Unified Wire Ethernet Controller
 	5415  T502-BT Unified Wire Ethernet Controller
+	5416  T580-OCP-SO Unified Wire Ethernet Controller
+	5417  T520-OCP-SO Unified Wire Ethernet Controller
 	5480  T540-5080 Unified Wire Ethernet Controller
 	5481  T540-5081 Unified Wire Ethernet Controller
 	5482  T504-5082 Unified Wire Ethernet Controller
@@ -15356,6 +15549,13 @@
 	5488  T570-5088 Unified Wire Ethernet Controller
 	5489  T520-5089 Unified Wire Ethernet Controller
 	5490  T540-5090 Unified Wire Ethernet Controller
+	5491  T522-5091 Unified Wire Ethernet Controller
+	5492  T520-5092 Unified Wire Ethernet Controller
+	5493  T580-5093 Unified Wire Ethernet Controller
+	5494  T540-5094 Unified Wire Ethernet Controller
+	5495  T540-5095 Unified Wire Ethernet Controller
+	5496  T580-5096 Unified Wire Ethernet Controller
+	5497  T520-5097 Unified Wire Ethernet Controller
 	5501  T520-CR Unified Wire Storage Controller
 	5502  T522-CR Unified Wire Storage Controller
 	5503  T540-CR Unified Wire Storage Controller
@@ -15377,6 +15577,8 @@
 	5513  T580-CHR Unified Wire Storage Controller
 	5514  T580-LP-SO-CR Unified Wire Storage Controller
 	5515  T502-BT Unified Wire Storage Controller
+	5516  T580-OCP-SO Unified Wire Storage Controller
+	5517  T520-OCP-SO Unified Wire Storage Controller
 	5580  T540-5080 Unified Wire Storage Controller
 	5581  T540-5081 Unified Wire Storage Controller
 	5582  T504-5082 Unified Wire Storage Controller
@@ -15388,6 +15590,13 @@
 	5588  T570-5088 Unified Wire Storage Controller
 	5589  T520-5089 Unified Wire Storage Controller
 	5590  T540-5090 Unified Wire Storage Controller
+	5591  T522-5091 Unified Wire Storage Controller
+	5592  T520-5092 Unified Wire Storage Controller
+	5593  T580-5093 Unified Wire Storage Controller
+	5594  T540-5094 Unified Wire Storage Controller
+	5595  T540-5095 Unified Wire Storage Controller
+	5596  T580-5096 Unified Wire Storage Controller
+	5597  T520-5097 Unified Wire Storage Controller
 	5601  T520-CR Unified Wire Storage Controller
 	5602  T522-CR Unified Wire Storage Controller
 	5603  T540-CR Unified Wire Storage Controller
@@ -15409,6 +15618,8 @@
 	5613  T580-CHR Unified Wire Storage Controller
 	5614  T580-LP-SO-CR Unified Wire Storage Controller
 	5615  T502-BT Unified Wire Storage Controller
+	5616  T580-OCP-SO Unified Wire Storage Controller
+	5617  T520-OCP-SO Unified Wire Storage Controller
 	5680  T540-5080 Unified Wire Storage Controller
 	5681  T540-5081 Unified Wire Storage Controller
 	5682  T504-5082 Unified Wire Storage Controller
@@ -15420,6 +15631,13 @@
 	5688  T570-5088 Unified Wire Storage Controller
 	5689  T520-5089 Unified Wire Storage Controller
 	5690  T540-5090 Unified Wire Storage Controller
+	5691  T522-5091 Unified Wire Storage Controller
+	5692  T520-5092 Unified Wire Storage Controller
+	5693  T580-5093 Unified Wire Storage Controller
+	5694  T540-5094 Unified Wire Storage Controller
+	5695  T540-5095 Unified Wire Storage Controller
+	5696  T580-5096 Unified Wire Storage Controller
+	5697  T520-5097 Unified Wire Storage Controller
 	5701  T520-CR Unified Wire Ethernet Controller
 	5702  T522-CR Unified Wire Ethernet Controller
 	5703  T540-CR Unified Wire Ethernet Controller
@@ -15452,6 +15670,13 @@
 	5788  T570-5088 Unified Wire Ethernet Controller
 	5789  T520-5089 Unified Wire Ethernet Controller
 	5790  T540-5090 Unified Wire Ethernet Controller
+	5791  T522-5091 Unified Wire Ethernet Controller
+	5792  T520-5092 Unified Wire Ethernet Controller
+	5793  T580-5093 Unified Wire Ethernet Controller
+	5794  T540-5094 Unified Wire Ethernet Controller
+	5795  T540-5095 Unified Wire Ethernet Controller
+	5796  T580-5096 Unified Wire Ethernet Controller
+	5797  T520-5097 Unified Wire Ethernet Controller
 	5801  T520-CR Unified Wire Ethernet Controller [VF]
 	5802  T522-CR Unified Wire Ethernet Controller [VF]
 	5803  T540-CR Unified Wire Ethernet Controller [VF]
@@ -15473,6 +15698,8 @@
 	5813  T580-CHR Unified Wire Ethernet Controller [VF]
 	5814  T580-LP-SO-CR Unified Wire Ethernet Controller [VF]
 	5815  T502-BT Unified Wire Ethernet Controller [VF]
+	5816  T580-OCP-SO Unified Wire Ethernet Controller [VF]
+	5817  T520-OCP-SO Unified Wire Ethernet Controller [VF]
 	5880  T540-5080 Unified Wire Ethernet Controller [VF]
 	5881  T540-5081 Unified Wire Ethernet Controller [VF]
 	5882  T504-5082 Unified Wire Ethernet Controller [VF]
@@ -15484,6 +15711,13 @@
 	5888  T570-5088 Unified Wire Ethernet Controller [VF]
 	5889  T520-5089 Unified Wire Ethernet Controller [VF]
 	5890  T540-5090 Unified Wire Ethernet Controller [VF]
+	5891  T522-5091 Unified Wire Ethernet Controller [VF]
+	5892  T520-5092 Unified Wire Ethernet Controller [VF]
+	5893  T580-5093 Unified Wire Ethernet Controller [VF]
+	5894  T540-5094 Unified Wire Ethernet Controller [VF]
+	5895  T540-5095 Unified Wire Ethernet Controller [VF]
+	5896  T580-5096 Unified Wire Ethernet Controller [VF]
+	5897  T520-5097 Unified Wire Ethernet Controller [VF]
 	a000  PE10K Unified Wire Ethernet Controller
 1426  Storage Technology Corp.
 1427  Better On-Line Solutions
@@ -15557,6 +15791,12 @@
 		1028 1f95  Express Flash NVMe XS1715 SSD 400GB
 		1028 1f96  Express Flash NVMe XS1715 SSD 800GB
 		1028 1f97  Express Flash NVMe XS1715 SSD 1600GB
+		1028 1fa4  Express Flash NVMe SM1715 3.2TB SFF
+		1028 1fa6  Express Flash NVMe SM1715 3.2TB AIC
+		1028 1fba  Express Flash NVMe SM1715 800GB SFF
+		1028 1fbb  Express Flash NVMe SM1715 1.6TB SFF
+		1028 1fbc  Express Flash NVMe SM1715 1.6TB AIC
+	a821  NVMe SSD Controller 172X
 144e  OLITEC
 144f  Askey Computer Corp.
 1450  Octave Communications Ind.
@@ -15636,7 +15876,6 @@
 	1003  HCF 56k Data/Fax Modem
 148e  OSI Plus Corporation
 148f  Plant Equipment, Inc.
-	5370  Dexlink AUWL15I1
 1490  Stone Microsystems PTY Ltd.
 1491  ZEAL Corporation
 1492  Time Logic Corporation
@@ -15667,9 +15906,9 @@
 14a1  Systembase Co Ltd
 14a2  Millennium Engineering Inc
 14a3  Maverick Networks
-# registered as GVC/BCM Advanced Research
-14a4  Broadcom Corporation (Wrong ID)
-	4318  BCM4318 [AirForce One 54g] 802.11g Wireless LAN Controller
+14a4  Lite-On Technology Corporation
+# Wrong vendor ID used
+	4318  Broadcom BCM4318 [AirForce One 54g] 802.11g WLAN Controller
 14a5  XIONICS Document Technologies Inc
 14a6  INOVA Computers GmBH & Co KG
 14a7  MYTHOS Systems Inc
@@ -15721,6 +15960,7 @@
 14be  L3 Communications
 14bf  SPIDER Communications Inc.
 14c0  COMPAL Electronics Inc
+# now owned by CSP, Inc.
 14c1  MYRICOM Inc.
 	0008  Myri-10G Dual-Protocol NIC
 		14c1 0008  10G-PCIE-8A
@@ -16027,8 +16267,8 @@
 		103c 280a  DC5750 Microtower
 	167d  NetXtreme BCM5751M Gigabit Ethernet PCI Express
 		1014 0577  ThinkPad Z60t
-		103c 0934  HP nx8220
-		103c 0940  HP Compaq nw8240 Mobile Workstation
+		103c 0934  nx8220
+		103c 0940  Compaq nw8240 Mobile Workstation
 		17aa 2081  ThinkPad R60e
 	167e  NetXtreme BCM5751F Fast Ethernet PCI Express
 	167f  NetLink BCM5787F Fast Ethernet PCI Express
@@ -16051,15 +16291,15 @@
 	168d  NetXtreme II BCM57840 10/20 Gigabit Ethernet
 	168e  NetXtreme II BCM57810 10 Gigabit Ethernet
 		103c 1798  Flex-10 10Gb 2-port 530FLB Adapter [Meru]
-		103c 17a5  HP Flex-10 10Gb 2-port 530M Adapter
-		103c 18d3  HP Ethernet 10Gb 2-port 530T Adapter
-		103c 1930  HP FlexFabric 10Gb 2-port 534FLR-SFP+ Adapter
-		103c 1931  HP StoreFabric CN1100R Dual Port Converged Network Adapter
-		103c 1932  HP FlexFabric 10Gb 2-port 534FLB Adapter
-		103c 1933  HP FlexFabric 10Gb 2-port 534M Adapter
-		103c 193a  HP FlexFabric 10Gb 2-port 533FLR-T Adapter
-		103c 3382  HP Ethernet 10Gb 2-port 530FLR-SFP+ Adapter
-		103c 339d  HP Ethernet 10Gb 2-port 530SFP+ Adapter
+		103c 17a5  Flex-10 10Gb 2-port 530M Adapter
+		103c 18d3  Ethernet 10Gb 2-port 530T Adapter
+		103c 1930  FlexFabric 10Gb 2-port 534FLR-SFP+ Adapter
+		103c 1931  StoreFabric CN1100R Dual Port Converged Network Adapter
+		103c 1932  FlexFabric 10Gb 2-port 534FLB Adapter
+		103c 1933  FlexFabric 10Gb 2-port 534M Adapter
+		103c 193a  FlexFabric 10Gb 2-port 533FLR-T Adapter
+		103c 3382  Ethernet 10Gb 2-port 530FLR-SFP+ Adapter
+		103c 339d  Ethernet 10Gb 2-port 530SFP+ Adapter
 	1690  NetXtreme BCM57760 Gigabit Ethernet PCIe
 	1691  NetLink BCM57788 Gigabit Ethernet PCIe
 		1028 04aa  XPS 8300
@@ -16085,12 +16325,16 @@
 	16a0  NetLink BCM5785 Fast Ethernet
 	16a1  BCM57840 NetXtreme II 10 Gigabit Ethernet
 	16a2  BCM57840 NetXtreme II 10/20-Gigabit Ethernet
-		103c 1916  HP FlexFabric 20Gb 2-port 630FLB Adapter
-		103c 1917  HP FlexFabric 20Gb 2-port 630M Adapter
+		103c 1916  FlexFabric 20Gb 2-port 630FLB Adapter
+		103c 1917  FlexFabric 20Gb 2-port 630M Adapter
+		103c 2231  3820C 10/20Gb Converged Network Adapter
+		103c 22fa  FlexFabric 10Gb 2-port 536FLB Adapter
 	16a3  NetXtreme BCM57786 Gigabit Ethernet PCIe
 	16a4  BCM57840 NetXtreme II Ethernet Multi Function
-		103c 1916  HP NPAR 20Gb 2-port 630FLB Adapter
-		103c 1917  HP NPAR 20Gb 2-port 630M Adapter
+		103c 1916  NPAR 20Gb 2-port 630FLB Adapter
+		103c 1917  NPAR 20Gb 2-port 630M Adapter
+		103c 2231  3820C 10/20Gb Converged Network Adapter (NPAR 1.5)
+		103c 22fa  FlexFabric 10Gb 2-port 536FLB Adapter (NPAR 1.5)
 # The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate.
 	16a5  NetXtreme II BCM57800 1/10 Gigabit Ethernet Multi Function
 		1028 1f5c  NetXtreme II BCM57800 10-Gigabit Ethernet Multi Function
@@ -16134,30 +16378,32 @@
 		103c 703b  NC373i Integrated Multifunction Gigabit Server Adapter
 		103c 703d  NC373F PCI Express Multifunction Gigabit Server Adapter
 	16ad  NetXtreme II BCM57840 10/20 Gigabit Ethernet Virtual Function
-		103c 1916  HP FlexFabric 20Gb 2-port 630FLB Adapter
-		103c 1917  HP FlexFabric 20Gb 2-port 630M Adapter
+		103c 1916  FlexFabric 20Gb 2-port 630FLB Adapter
+		103c 1917  FlexFabric 20Gb 2-port 630M Adapter
+		103c 2231  3820C 10/20Gb Converged Network Adapter (SR-IOV VF)
+		103c 22fa  FlexFabric 10Gb 2-port 536FLB Adapter (SR-IOV VF)
 	16ae  NetXtreme II BCM57810 10 Gigabit Ethernet Multi Function
-		103c 1798  HP NPAR 10Gb 2-port 530FLB Adapter
-		103c 17a5  HP NPAR 10Gb 2-port 530M Adapter
-		103c 18d3  HP NPAR 10Gb 2-port 530T Adapter
-		103c 1930  HP NPAR 10Gb 2-port 534FLR-SFP+ Adapter
-		103c 1931  HP NPAR CN1100R Dual Port Converged Network Adapter
-		103c 1932  HP NPAR 10Gb 2-port 534FLB Adapter
-		103c 1933  HP NPAR 10Gb 2-port 534M Adapter
-		103c 193a  HP NPAR 10Gb 2-port 533FLR-T Adapter
-		103c 3382  HP NPAR 10Gb 2-port 530FLR-SFP+ Adapter
-		103c 339d  HP NPAR 10Gb 2-port 530SFP+ Adapter
+		103c 1798  NPAR 10Gb 2-port 530FLB Adapter
+		103c 17a5  NPAR 10Gb 2-port 530M Adapter
+		103c 18d3  NPAR 10Gb 2-port 530T Adapter
+		103c 1930  NPAR 10Gb 2-port 534FLR-SFP+ Adapter
+		103c 1931  NPAR CN1100R Dual Port Converged Network Adapter
+		103c 1932  NPAR 10Gb 2-port 534FLB Adapter
+		103c 1933  NPAR 10Gb 2-port 534M Adapter
+		103c 193a  NPAR 10Gb 2-port 533FLR-T Adapter
+		103c 3382  NPAR 10Gb 2-port 530FLR-SFP+ Adapter
+		103c 339d  NPAR 10Gb 2-port 530SFP+ Adapter
 	16af  NetXtreme II BCM57810 10 Gigabit Ethernet Virtual Function
-		103c 1798  HP Flex-10 10Gb 2-port 530FLB Adapter
-		103c 17a5  HP Flex-10 10Gb 2-port 530M Adapter
-		103c 18d3  HP Ethernet 10Gb 2-port 530T Adapter
-		103c 1930  HP FlexFabric 10Gb 2-port 534FLR-SFP+ Adapter
-		103c 1931  HP StoreFabric CN1100R Dual Port Converged Network Adapter
-		103c 1932  HP FlexFabric 10Gb 2-port 534FLB Adapter
-		103c 1933  HP FlexFabric 10Gb 2-port 534M Adapter
-		103c 193a  HP FlexFabric 10Gb 2-port 533FLR-T Adapter
-		103c 3382  HP Ethernet 10Gb 2-port 530FLR-SFP+ Adapter
-		103c 339d  HP Ethernet 10Gb 2-port 530SFP+ Adapter
+		103c 1798  Flex-10 10Gb 2-port 530FLB Adapter
+		103c 17a5  Flex-10 10Gb 2-port 530M Adapter
+		103c 18d3  Ethernet 10Gb 2-port 530T Adapter
+		103c 1930  FlexFabric 10Gb 2-port 534FLR-SFP+ Adapter
+		103c 1931  StoreFabric CN1100R Dual Port Converged Network Adapter
+		103c 1932  FlexFabric 10Gb 2-port 534FLB Adapter
+		103c 1933  FlexFabric 10Gb 2-port 534M Adapter
+		103c 193a  FlexFabric 10Gb 2-port 533FLR-T Adapter
+		103c 3382  Ethernet 10Gb 2-port 530FLR-SFP+ Adapter
+		103c 339d  Ethernet 10Gb 2-port 530SFP+ Adapter
 	16b0  NetXtreme BCM57761 Gigabit Ethernet PCIe
 	16b1  NetLink BCM57781 Gigabit Ethernet PCIe
 		1849 96b1  Z77 Extreme4 motherboard
@@ -16391,9 +16637,11 @@
 	43d3  BCM43567 802.11ac Wireless Network Adapter
 	43d9  BCM43570 802.11ac Wireless Network Adapter
 	43df  BCM4354 802.11ac Wireless LAN SoC
+	43e9  BCM4358 802.11ac Wireless LAN SoC
 	43ec  BCM4356 802.11ac Wireless Network Adapter
 	4401  BCM4401 100Base-T
 		1025 0035  TravelMate 660
+		1025 0064  Extensa 3000 series laptop
 		103c 08b0  tc1100 tablet
 		1043 80a8  A7V8X motherboard
 	4402  BCM4402 Integrated 10/100BaseT
@@ -16450,6 +16698,7 @@
 	5850  BCM5850 Crypto Accelerator
 	8602  BCM7400/BCM7405 Serial ATA Controller
 	a8d8  BCM43224/5 Wireless Network Adapter
+	aa52  BCM43602 802.11ac Wireless LAN SoC
 	b302  BCM56302 StrataXGS 24x1GE 2x10GE Switch Controller
 	b334  BCM56334 StrataXGS 24x1GE 4x10GE Switch Controller
 	b800  BCM56800 StrataXGS 10GE Switch Controller
@@ -16733,6 +16982,7 @@
 		4254 9580  T9580
 		4254 980c  T980C
 	8880  CX23887/8 PCIe Broadcast Audio and Video Decoder with 3D Comb
+		0070 2259  WinTV HVR-1250
 		0070 c108  WinTV-HVR-4400-HD model 1278
 		5654 2389  GoTView X5 DVD Hybrid PCI-E
 		5654 2390  GoTView X5 3D HYBRID PCI-E
@@ -17093,15 +17343,24 @@
 	01ff  MT27600 Family [Connect-IB Flash Recovery]
 	0209  MT27700 Family [ConnectX-4 Flash Recovery]
 	020b  MT27710 Family [ConnectX-4 Lx Flash Recovery]
+	020d  MT28800 Family [ConnectX-5 Flash Recovery]
 	1002  MT25400 Family [ConnectX-2 Virtual Function]
 	1003  MT27500 Family [ConnectX-3]
 		103c 1777  InfiniBand FDR/EN 10/40Gb Dual Port 544FLR-QSFP Adapter (Rev Cx)
 		103c 17c9  Infiniband QDR/Ethernet 10Gb 2-port 544i Adapter
+		103c 18ce  InfiniBand QDR/EN 10Gb Dual Port 544M Adapter
+		103c 18cf  InfiniBand FDR/EN 10/40Gb Dual Port 544M Adapter
 		103c 18d6  InfiniBand FDR/EN 10/40Gb Dual Port 544QSFP Adapter
 	1004  MT27500/MT27520 Family [ConnectX-3/ConnectX-3 Pro Virtual Function]
 	1005  MT27510 Family
 	1006  MT27511 Family
 	1007  MT27520 Family [ConnectX-3 Pro]
+		103c 22f3  InfiniBand FDR/Ethernet 10Gb/40Gb 2-port 544+QSFP Adapter
+		103c 22f4  InfiniBand FDR/Ethernet 10Gb/40Gb 2-port 544+FLR-QSFP Adapter
+		117c 0090  FastFrame NQ41
+		117c 0091  FastFrame NQ42
+		117c 0092  FastFrame NQ11
+		117c 0093  FastFrame NQ12
 	1009  MT27530 Family
 	100a  MT27531 Family
 	100b  MT27540 Family
@@ -17116,8 +17375,8 @@
 	1014  MT27700 Family [ConnectX-4 Virtual Function]
 	1015  MT27710 Family [ConnectX-4 Lx]
 	1016  MT27710 Family [ConnectX-4 Lx Virtual Function]
-	1017  MT27640 Family
-	1018  MT27641 Family
+	1017  MT28800 Family [ConnectX-4]
+	1018  MT28800 Family [ConnectX-5 Virtual Function]
 	5274  MT21108 InfiniBridge
 	5a44  MT23108 InfiniHost
 	5a45  MT23108 [Infinihost HCA Flash Recovery]
@@ -17134,15 +17393,23 @@
 	6372  MT25408 [ConnectX EN 10GigE 10GBaseT, PCIe 2.0 2.5GT/s]
 	6732  MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
 	673c  MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
+		103c 1782  4X QDR InfiniBand Mezzanine HCA for c-Class BladeSystem
+		15b3 0021  HP InfiniBand 4X QDR CX-2 PCI-e G2 Dual Port HCA
 	6746  MT26438 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE Virtualization+]
 		103c 1781  NC543i 1-port 4x QDR IB/Flex-10 10Gb Adapter
 		103c 3349  NC543i 2-port 4xQDR IB/10Gb Adapter
 	6750  MT26448 [ConnectX EN 10GigE, PCIe 2.0 5GT/s]
+		15b3 0018  HP 10 GbE PCI-e G2 Dual-Port NIC (rev C1)
 	675a  MT25408 [ConnectX EN 10GigE 10GBaseT, PCIe Gen2 5GT/s]
 	6764  MT26468 [ConnectX EN 10GigE, PCIe 2.0 5GT/s Virtualization+]
-		103c 3313  HP NC542m Dual Port Flex-10 10GbE BLc Adapter
+		103c 3313  NC542m Dual Port Flex-10 10GbE BLc Adapter
 	676e  MT26478 [ConnectX EN 40GigE, PCIe 2.0 5GT/s]
 	6778  MT26488 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE Virtualization+]
+# SwitchX-2, 40GbE switch
+	c738  MT51136
+	caf1  ConnectX-4 CAPI Function
+# Spectrum, 100GbE Switch
+	cb84  MT52100
 15b4  CCI/TRIAD
 15b5  Cimetrics Inc
 15b6  Texas Memory Systems Inc
@@ -17321,15 +17588,15 @@
 1642  Bitland(ShenZhen) Information Technology Co., Ltd.
 1657  Brocade Communications Systems, Inc.
 	0013  425/825/42B/82B 4Gbps/8Gbps PCIe dual port FC HBA
-		103c 1742  HP 82B 8Gbps dual port FC HBA
-		103c 1744  HP 42B 4Gbps dual port FC HBA
+		103c 1742  82B 8Gbps dual port FC HBA
+		103c 1744  42B 4Gbps dual port FC HBA
 		1657 0014  425/825 4Gbps/8Gbps PCIe dual port FC HBA
 	0014  1010/1020/1007/1741 10Gbps CNA
 		1657 0014  1010/1020/1007/1741 10Gbps CNA - FCOE
 		1657 0015  1010/1020/1007/1741 10Gbps CNA - LL
 	0017  415/815/41B/81B 4Gbps/8Gbps PCIe single port FC HBA
-		103c 1741  HP 41B 4Gbps single port FC HBA
-		103c 1743  HP 81B 8Gbps single port FC HBA
+		103c 1741  41B 4Gbps single port FC HBA
+		103c 1743  81B 8Gbps single port FC HBA
 		1657 0014  415/815 4Gbps/8Gbps single port PCIe FC HBA
 	0021  804 8Gbps FC HBA for HP Bladesystem c-class
 # AnyIO Adapter
@@ -17346,6 +17613,74 @@
 	d200  PIXCI(R) D2X Digital Video Capture Board [custom QL5232]
 	d300  PIXCI(R) D3X Digital Video Capture Board [custom QL5232]
 	eb01  PIXCI(R) EB1 PCI Camera Link Video Capture Board
+# Gidel Reconfigurable Computing
+165c  Gidel Ltd.
+	5361  PROCStarII60-1
+	5362  PROCStarII60-2
+	5364  PROCStarII60-4
+	5435  ProcSparkII
+	5661  ProcE60
+	56e1  ProcE180
+	5911  ProcStarIII110-1
+	5912  ProcStarIII110-2
+	5913  ProcStarIII110-3
+	5914  ProcStarIII110-4
+	5921  ProcStarIII150-1
+	5922  ProcStarIII150-2
+	5923  ProcStarIII150-3
+	5924  ProcStarIII150-4
+	5931  ProcStarIII260-1
+	5932  ProcStarIII260-2
+	5933  ProcStarIII260-3
+	5934  ProcStarIII260-4
+	5941  ProcStarIII340-1
+	5942  ProcStarIII340-2
+	5943  ProcStarIII340-3
+	5944  ProcStarIII340-4
+	5a01  ProceIII80
+	5a11  ProceIII110
+	5a21  ProceIII150
+	5a31  ProceIII260
+	5a41  ProceIII340
+	5b51  ProceIV360
+	5b61  ProceIV530
+	5b71  ProceIV820
+	5c01  ProcStarIV80-1
+	5c02  ProcStarIV80-2
+	5c03  ProcStarIV80-3
+	5c04  ProcStarIV80-4
+	5c11  ProcStarIV110-1
+	5c12  ProcStarIV110-2
+	5c13  ProcStarIV110-3
+	5c14  ProcStarIV110-4
+	5c51  ProcStarIV360-1
+	5c52  ProcStarIV360-2
+	5c53  ProcStarIV360-3
+	5c54  ProcStarIV360-4
+	5c61  ProcStarIV530-1
+	5c62  ProcStarIV530-2
+	5c63  ProcStarIV530-3
+	5c64  ProcStarIV530-4
+	5c71  ProcStarIV820-1
+	5c72  ProcStarIV820-2
+	5c73  ProcStarIV820-3
+	5c74  ProcStarIV820-4
+	5d01  Proc10480
+	5d11  Proc104110
+	5f01  ProceV_A3
+	5f11  ProceV_A7
+	5f21  ProceV_AB
+	5f31  ProceV_D5
+	5f41  ProceV_D8
+	6732  Proc6M
+	6832  Proc12M
+	7101  Proc10a_27
+	7111  Proc10a_48
+	7121  Proc10a_66
+	7141  Proc10a_115
+	7181  Proc10a_27S
+	7191  Proc10a_48S
+	71a1  Proc10a_66S
 165d  Hsing Tech. Enterprise Co., Ltd.
 165f  Linux Media Labs, LLC
 	1020  LMLM4 MPEG-4 encoder
@@ -17393,8 +17728,7 @@
 		126c 8031  2201 Mobile Adapter
 		1385 4400  WAB501 802.11ab Wireless CardBus Card
 		1b47 aa00  8460 802.11ab Wireless CardBus Adapter
-# AR5001G, AR5001X+, AR5002G, AR5002X, AR5004G, AR5004X chipsets
-	0013  AR5212/AR5213 Wireless Network Adapter
+	0013  AR5212/5213/2414 Wireless Network Adapter
 		0308 3402  AG-100 802.11ag Wireless Cardbus Adapter
 		0308 3405  G-102 v2 802.11g Wireless Cardbus Adapter
 		0308 3408  G-170S 802.11g Wireless CardBus Adapter
@@ -17425,7 +17759,7 @@
 		1385 4b00  WG511T 108 Mbps Wireless PC Card (rev.A/B)
 		1385 4d00  WG311T 108 Mbps Wireless PCI Adapter (rev.A2)
 		1385 4f00  WG511U Double 108 Mbps Wireless PC Card
-		1385 5a00  WG311T 108 Mbps Wireless PCI Adapter (rev.A3)
+		1385 5a00  WG311T (rev.A3 v1h3/v1h4) 108 Mbps Wireless PCI Adapter [AR2412]
 		1385 5b00  WG511T 108 Mbps Wireless PC Card (rev.C)
 		1385 5d00  WPN511 RangeMax Wireless PC Card
 		1458 e911  GN-WIAG02
@@ -17552,6 +17886,7 @@
 	002a  AR928X Wireless Network Adapter (PCI-Express)
 		0777 4f05  SR71-X 802.11abgn Wireless ExpressCard Adapter [AR9280]
 		103c 3041  AR5BHB92-H 802.11abgn Wireless Half-size Mini PCIe Card [AR9280]
+		103c 3042  AzureWave AW-NE773 802.11abgn Wireless Half-size Mini PCIe Card [AR9280]
 		105b e006  T77H053.00 802.11bgn Wireless Mini PCIe Card [AR9281]
 		105b e01f  T77H047.31 802.11bgn Wireless Half-size Mini PCIe Card [AR9283]
 		106b 008f  AirPort Extreme
@@ -17600,6 +17935,8 @@
 	003c  QCA986x/988x 802.11ac Wireless Network Adapter
 	003e  QCA6174 802.11ac Wireless Network Adapter
 		1a56 1525  Killer N1525 Wireless-AC
+	0040  QCA9980/9990 802.11ac Wireless Network Adapter
+	0041  QCA6164 802.11ac Wireless Network Adapter
 	0207  AR5210 Wireless Network Adapter [AR5000 802.11a]
 	1014  AR5212 802.11abg NIC
 		1014 058a  ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6)
@@ -17625,6 +17962,8 @@
 	0001  SafeXcel 1140
 	000a  SafeXcel 1841
 	1141  SafeXcel 1141
+# misused vendor ID 0001
+		0001 0001  SafeXcel 1141 v. 1.1
 	1841  SafeXcel 1842
 16af  SparkLAN Communications, Inc.
 16b4  Aspex Semiconductor Ltd
@@ -17713,6 +18052,8 @@
 	7003  XMC-7K410AX: User-Configurable Kintex-7 FPGA, 410k logic cells with AXM Plug-In I/O
 	7004  XMC-7K325CC: User-Configurable Kintex-7 FPGA, 325k logic cells, conduction-cooled
 	7005  XMC-7K410CC: User-Configurable Kintex-7 FPGA, 410k logic cells, conduction-cooled
+	7006  XMC-7A200: User-Configurable Artix-7 FPGA, 200k logic cells with Plug-In I/O
+	7007  XMC-7A200CC: User-Configurable Conduction-Cooled Artix-7 FPGA, with 200k logic cells
 16da  Advantech Co., Ltd.
 	0011  INES GPIB-PCI
 16df  PIKA Technologies Inc.
@@ -17805,6 +18146,8 @@
 	0094  Octeon Fusion CNF71XX Cell processor
 	0095  Octeon III CN78XX Network Processor
 	0096  Octeon III CN70XX Network Processor
+	9700  Octeon III CN73XX Network Processor
+	9800  Octeon Fusion CNF75XX Processor
 	a001  THUNDERX MRML Bridge
 	a002  THUNDERX PCC Bridge
 		177d a102  CN88XX PCC Bridge
@@ -17869,7 +18212,9 @@
 	0011  SIS1100-e single link
 	0012  SIS1100-e quad link
 	0015  SIS8100 [Gigabit link, MicroTCA]
-1797  Techwell Inc.
+# nee Techwell, Inc.
+1797  Intersil Techwell
+	5864  TW5864 multimedia video controller
 	6801  TW6802 multimedia video card
 	6802  TW6802 multimedia other device
 	6810  TW6816 multimedia video controller
@@ -17937,6 +18282,11 @@
 	1170  ARC-1170 24-Port PCI-X to SATA RAID Controller
 	1201  ARC-1200 2-Port PCI-Express to SATA II RAID Controller
 	1210  ARC-1210 4-Port PCI-Express to SATA RAID Controller
+	1214  ARC-12x4 PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+		17d3 1214  ARC-1214 4-Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+		17d3 1224  ARC-1224 8-Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+		17d3 1264  ARC-1264 12/16 Port PCIe 2.0 to SATA 6Gb RAID Controller
+		17d3 1284  ARC-1284 24 Port PCIe 2.0 to SATA 6Gb RAID Controller
 	1220  ARC-1220 8-Port PCI-Express to SATA RAID Controller
 	1222  ARC-1222 8-Port PCI-Express to SAS/SATA II RAID Controller
 	1230  ARC-1230 12-Port PCI-Express to SATA RAID Controller
@@ -17944,9 +18294,22 @@
 	1280  ARC-1280/1280ML 24-Port PCI-Express to SATA II RAID Controller
 		17d3 1221  ARC-1221 8-Port PCI-Express to SATA RAID Controller
 	1300  ARC-1300ix-16 16-Port PCI-Express to SAS Non-RAID Host Adapter
-	1680  ARC-1680 8 port PCIe/PCI-X to SAS/SATA II RAID Controller
+	1320  ARC-1320 8/16 Port PCIe 2.0 to SAS/SATA 6Gb Non-RAID Host Adapter
+	1330  ARC-1330 16 Port PCIe 3.0 to SAS/SATA 12Gb Non-RAID Host Adapter
+	1680  ARC-1680 series PCIe to SAS/SATA 3Gb RAID Controller
 		17d3 1212  ARC-1212 4-Port PCIe to SAS/SATA II RAID Controller
-	1880  ARC-1880 8/12 port PCIe/PCI-X to SAS/SATA II RAID Controller
+		17d3 1222  ARC-1222 8-Port PCIe to SAS/SATA 3Gb RAID Controller
+		17d3 1680  ARC-1680 8/12/16/24 Port PCIe to SAS/SATA 3Gb RAID Controller
+	1880  ARC-188x series PCIe 2.0/3.0 to SAS/SATA 6/12Gb RAID Controller
+		17d3 1213  ARC-1213 4-Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+		17d3 1215  ARC-1215 4-Port PCIe 3.0 to SAS/SATA 6Gb RAID Controller
+		17d3 1216  ARC-1216 4-Port PCIe 3.0 to SAS/SATA 12Gb RAID Controller
+		17d3 1223  ARC-1223 8-Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+		17d3 1225  ARC-1225 8-Port PCIe 3.0 to SAS/SATA 6Gb RAID Controller
+		17d3 1226  ARC-1226 8-Port PCIe 3.0 to SAS/SATA 12Gb RAID Controller
+		17d3 1880  ARC-1880 8/12/16/24 Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+		17d3 1882  ARC-1882 8/12/16/24 Port PCIe 3.0 to SAS/SATA 6Gb RAID Controller
+		17d3 1883  ARC-1883 8/12/16/24 Port PCIe 3.0 to SAS/SATA 12Gb RAID Controller
 # nee Neterion Inc., previously S2io Inc.
 17d5  Exar Corp.
 	5731  Xframe 10-Gigabit Ethernet PCI-X
@@ -18094,9 +18457,11 @@
 	5360  RT5360 Wireless 802.11n 1T/1R
 		1186 3c05  DWA-525 Wireless N 150 Desktop Adapter (rev.A2)
 		20f4 703a  TEW-703PI N150 Wireless PCI Adapter
+	5362  RT5362 PCI 802.11n Wireless Network Adapter
 	5390  RT5390 Wireless 802.11n 1T/1R PCIe
 		103c 1636  U98Z077.00 Half-size Mini PCIe Card
 	5392  RT5392 PCIe Wireless Network Adapter
+	539b  RT5390R 802.11bgn PCIe Wireless Network Adapter
 	539f  RT5390 [802.11 b/g/n 1T1R G-band PCI Express Single Chip]
 		103c 1637  Pavilion DM1Z-3000 PCIe wireless card
 	5592  RT5592 PCIe Wireless Network Adapter
@@ -18125,6 +18490,7 @@
 1849  ASRock Incorporation
 184a  Thales Computers
 	1100  MAX II cPLD
+1850  Advantest Corporation
 1851  Microtune, Inc.
 1852  Anritsu Corp.
 1853  SMSC Automotive Infotainment System Group
@@ -18288,6 +18654,7 @@
 	0135  NT20E2-PTP Network Adapter 2x10Gb
 	0145  NT40E3-4-PTP Network Adapter 4x10Gb
 	0155  NT100E3-1-PTP Network Adapter 1x100Gb
+	0175  NT20E3-2-PTP Network Adapter 2x10Gb
 18f6  NextIO
 	1000  [Nexsis] Switch Virtual P2P PCIe Bridge
 	1001  [Texsis] Switch Virtual P2P PCIe Bridge
@@ -18431,10 +18798,12 @@
 		1924 8007  SFN7322F-R2 Precision Time SFP+ Server Adapter
 		1924 8009  SFN7x22F-R2 Flareon Ultra 7000 Series 10G Adapter
 		1924 800a  SFN7x02F-R2 Flareon 7000 Series 10G Adapter
-		1924 800b  SFN7x22F-R3 Flareon Ultra 7000 Series 10G Adapter
-		1924 800c  SFN7x02F-R3 Flareon 7000 Series 10G Adapter
+		1924 800c  SFN7x22F-R3 Flareon Ultra 7000 Series 10G Adapter
+		1924 800d  SFN7x02F-R3 Flareon 7000 Series 10G Adapter
 	0923  SFC9140
 		1924 800b  SFN7x42Q-R1 Flareon Ultra 7000 Series 10/40G Adapter
+		1924 800e  SFN7x42Q-R2 Flareon Ultra 7000 Series 10/40G Adapter
+		1924 800f  SFN7xx4F-R1 Flareon Ultra 7000 Series 10G Adapter
 	1803  SFC9020 Virtual Function [Solarstorm]
 	1813  SFL9021 Virtual Function [Solarstorm]
 	1903  SFC9120 Virtual Function
@@ -18567,6 +18936,8 @@
 		1a56 1201  Killer E2100 Gigabit Ethernet Controller
 # PCIe interface for emulator
 	fc02  RedStone
+# CFI device over PCIe
+	fc03  CFI
 1958  Faster Technology, LLC.
 1959  PA Semi, Inc
 	a000  PA6T Core
@@ -18701,6 +19072,8 @@
 19ae  Progeny Systems Corporation
 	0520  4135 HFT Interface Controller
 	0521  Decimator
+19ba  ZyXEL Communications Corp.
+	2330  ZyWALL Turbo Card
 19c1  Exegy Inc.
 # nee NextNet Wireless
 19d1  Motorola Expedience
@@ -18851,6 +19224,8 @@
 	0301  Wil6200 802.11ad Wireless Network Adapter
 	0302  Wil6200 802.11ad Wireless Network Adapter
 	0310  Wil6200 802.11ad Wireless Network Adapter
+1aea  Alcor Micro
+	6601  AU6601 PCI-E Flash card reader controller
 1aec  Wolfson Microelectronics
 # nee Fusion-io
 1aed  SanDisk
@@ -18888,6 +19263,7 @@
 1afa  J & W Electronics Co., Ltd.
 1b03  Magnum Semiconductor, Inc,
 	6100  DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
+	7000  D7 Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
 1b08  MSC Vertriebs GmbH
 1b0a  Pegatron
 1b13  Jaton Corp
@@ -18903,6 +19279,7 @@
 	1080  ASM1083/1085 PCIe to PCI Bridge
 		1849 1080  Motherboard
 	1142  ASM1042A USB 3.0 Host Controller
+	1242  ASM1142 USB 3.1 Host Controller
 1b2c  Opal-RT Technologies Inc.
 1b36  Red Hat, Inc.
 	0001  QEMU PCI-PCI bridge
@@ -18917,7 +19294,20 @@
 	0100  QXL paravirtual graphic card
 		1af4 1100  QEMU Virtual Machine
 1b37  Signal Processing Devices Sweden AB
+	0001  ADQ214
+	0003  ADQ114
+	0005  ADQ112
+	000e  ADQ108
+	000f  ADQDSP
 	0014  ADQ412
+	0015  ADQ212
+	001b  SDR14
+	001c  ADQ1600
+	001e  ADQ208
+	001f  DSU
+	0020  ADQ14
+	2014  TX320
+	2019  S6000
 # now owned by HGST (a Western Digital subsidiary)
 1b39  sTec, Inc.
 	0001  S1120 PCIe Accelerator SSD
@@ -18936,6 +19326,7 @@
 	0640  88SE9128 SATA III 6Gb/s RAID Controller
 	9120  88SE9120 SATA 6Gb/s Controller
 	9123  88SE9123 PCIe SATA 6.0 Gb/s controller
+		dc93 600e  DC-6xxe series SATA 6G controller
 	9125  88SE9125 PCIe SATA 6.0 Gb/s controller
 	9128  88SE9128 PCIe SATA 6 Gb/s RAID controller
 	9130  88SE9128 PCIe SATA 6 Gb/s RAID controller with HyperDuo
@@ -18969,6 +19360,7 @@
 	1000  FL1000G USB 3.0 Host Controller
 		1d5c 1000  Anker USB 3.0 Express Card
 	1009  FL1009 USB 3.0 Host Controller
+	1100  FL1100 USB 3.0 Host Controller
 1b74  OpenVox Communication Co. Ltd.
 	0115  D115P/D115E Single-port E1/T1 card
 	d130  D130P/D130E Single-port E1/T1 card (3rd GEN)
@@ -19010,11 +19402,23 @@
 1bbf  Maxeler Technologies Ltd.
 	0003  MAX3
 	0004  MAX4
+1bd0  Astronics Corporation
+	1001  Mx5 PMC/XMC Databus Interface Card
+	1002  PM1553-5 (PC/104+ MIL-STD-1553 Interface Card)
+	1004  AB3000 Series Rugged Computer
+	1005  PE1000 (Multi-Protocol PCIe/104 Interface Card)
+	1101  OmniBus II PCIe Multi-Protocol Interface Card
+	1102  OmniBusBox II Multi-Protocol Interface Core
+	1103  OmniBus II cPCIe/PXIe Multi-Protocol Interface Card
 1bee  IXXAT Automation GmbH
 	0003  CAN-IB200/PCIe
 1bf4  VTI Instruments Corporation
 	0001  SentinelEX
 1bfd  EeeTOP
+1c09  CSP, Inc.
+	4254  10G-PCIE3-8D-2S
+	4255  10G-PCIE3-8D-Q
+	4256  10G-PCIE3-8D-2S
 1c1c  Symphony
 	0001  82C101
 1c28  Lite-On IT Corp. / Plextor
@@ -19038,6 +19442,9 @@
 	0300  Telas 2.V
 1c44  Enmotus Inc
 	8000  8000 Storage IO Controller
+# A Western Digital Subsidiary
+1c58  HGST, Inc.
+	0003  Ultrastar SN100 Series NVMe SSD
 1c7e  TTTech Computertechnik AG
 	0200  zFAS Debug Port
 1c7f  Elektrobit Austria GmbH
@@ -19049,20 +19456,41 @@
 	0100  CAN-PCIe-02
 1cd2  SesKion GmbH
 	0301  Simulyzer-RT CompactPCI Serial DIO-1 card
+	0302  Simulyzer-RT CompactPCI Serial PSI5-ECU-1 card
+	0303  Simulyzer-RT CompactPCI Serial PSI5-SIM-1 card
+	0304  Simulyzer-RT CompactPCI Serial PWR-ANA-1 card
+1cdd  secunet Security Networks AG
 1ce4  Exablaze
 	0001  ExaNIC X4
 	0002  ExaNIC X2
+	0003  ExaNIC X10
 1cf7  Subspace Dynamics
+1d00  Pure Storage
+1d1d  CNEX Labs
+	2807  8800 series NVMe SSD
 # CEM Solutions Pvt. Ltd.
 1d21  Allo
 1d26  Kalray Inc.
 	0040  Turbocard2 Accelerator
 	e004  AB01/EMB01 Development Board
+1d40  Techman Electronics (Changshu) Co., Ltd.
 1d44  DPT
 	a400  PM2x24/PM3224
 1d5c  Fantasia Trading LLC
+1d61  Technobox, Inc.
+1d65  Imagine Communications Corp.
+	04de  Taurus/McKinley
+1d6c  Atomic Rules LLC
+	1001  A5PL-E1
+	1002  A5PL-E7
+	1003  S5PEDS-AB
+	1004  KC705-K325
+	1005  ZC706-Z045
+	1006  KCU105-KU040
+	1007  XUSP3S-VU095 [Jasper]
+	4200  A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument]
 1de1  Tekram Technology Co.,Ltd.
-	0391  TRM-S1040
+	0391  TRM-S1040 [DC-315 / DC-395 series]
 	2020  DC-390
 	690c  690c
 	dc29  DC290
@@ -19098,6 +19526,19 @@
 		0000 3011  10-Giga TOE Dual Port SFP+/CX4 Low Profile SmartNIC
 		0000 3012  10-Giga TOE Dual Port CX4/SFP+ Low Profile SmartNIC
 		0000 3014  10-Giga TOE Dual Port CX4 Low Profile SmartNIC
+	4010  TN4010 Clean SROM
+	4020  TN9030 10GbE CX4 Ethernet Adapter
+	4022  TN9310 10GbE SFP+ Ethernet Adapter
+		1186 4d00  DXE-810S 10GbE SFP+ Ethernet Adapter
+		1fc9 3015  Ethernet Adapter
+	4024  TN9210 10GBase-T Ethernet Adapter
+	4025  TN9510 10GBase-T/NBASE-T Ethernet Adapter
+		1186 2900  DXE-810T 10GBase-T Ethernet Adapter
+		1fc9 3015  Ethernet Adapter
+	4026  TN9610 10GbE SFP+ Ethernet Adapter
+1fcc  StreamLabs
+	f416  MS416
+	fb01  MH4LM
 1fce  Cognio Inc.
 	0001  Spectrum Analyzer PC Card (SAgE)
 1fd4  SUNIX Co., Ltd.
@@ -19122,6 +19563,7 @@
 2955  Connectix Virtual PC
 	6e61  OHCI USB 1.1 controller
 2a15  3D Vision(???)
+2bd8  ROPEX Industrie-Elektronik GmbH
 3000  Hansol Electronics Inc.
 3142  Post Impression Systems.
 31ab  Zonet
@@ -19266,6 +19708,14 @@
 	0200  CPC
 4254  DVBSky
 4321  Tata Power Strategic Electronics Division
+4348  WCH.CN
+	2273  CH351 PCI Dual Serial Port Controller
+	3253  CH352 PCI Dual Serial Port Controller
+	3453  CH353 PCI Quad Serial Port Controller
+	5053  CH352 PCI Serial and Parallel Port Controller
+	7053  CH353 PCI Dual Serial and Parallel Ports Controller
+	7073  CH356 PCI Quad Serial and Parallel Ports Controller
+	7173  CH355 PCI Quad Serial Port Controller
 434e  CAST Navigation LLC
 4444  Internext Compression Inc
 	0016  iTVC16 (CX23416) Video Decoder
@@ -19620,6 +20070,7 @@
 	8032  tDVR8032 32-chan video capture card
 5853  XenSource, Inc.
 	0001  Xen Platform Device
+	c000  Citrix XenServer PCI Device for Windows Update
 # Virtual device surfaced in guests to provide HID events.
 	c110  Virtualized HID
 # Device surfaced in guests to provide 2d graphics capabilities
@@ -19682,12 +20133,14 @@
 	0044  Core Processor DRAM Controller
 		1025 0347  Aspire 7740G
 		1025 0487  TravelMate 5742
+		1028 040a  Latitude E6410
 		144d c06a  R730 Laptop
 		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
 		e4bf 50c1  PC1-GROOVE
 	0045  Core Processor PCI Express x16 Root Port
 		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
 	0046  Core Processor Integrated Graphics Controller
+		1028 040a  Latitude E6410
 		144d c06a  R730 Laptop
 		17c0 10d9  Medion Akoya E7214 Notebook PC [MD98410]
 		e4bf 50c1  PC1-GROOVE
@@ -19793,6 +20246,7 @@
 	0153  3rd Gen Core Processor Thermal Subsystem
 		1043 1517  Zenbook Prime UX31A
 	0154  3rd Gen Core processor DRAM Controller
+		1025 0806  Aspire E1-470G
 		1025 0813  Aspire R7-571
 		103c 17f6  ProBook 4540s
 		1043 1477  N56VZ
@@ -19852,13 +20306,15 @@
 		17aa 220e  ThinkPad T440p
 	041a  Xeon E3-1200 v3 Processor Integrated Graphics Controller
 	041e  4th Generation Core Processor Family Integrated Graphics Controller
-	0433  Coleto Creek ACC - ME/CPM interface
-	0435  Coleto Creek PCIe Endpoint
+	0434  DH89XXCC Series QAT
+	0435  DH895XCC Series QAT
 	0436  DH8900CC Null Device
 	0438  DH8900CC Series Gigabit Network Connection
 	043a  DH8900CC Series Gigabit Fiber Network Connection
 	043c  DH8900CC Series Gigabit Backplane Network Connection
 	0440  DH8900CC Series Gigabit SFP Network Connection
+	0442  DH89XXCC Series QAT Virtual Function
+	0443  DH895XCC Series QAT Virtual Function
 	0482  82375EB/SB PCI to EISA Bridge
 	0483  82424TX/ZX [Saturn] CPU to PCI bridge
 	0484  82378ZB/IB, 82379AB (SIO, SIO.A) PCI to ISA Bridge
@@ -20312,6 +20768,10 @@
 	0c48  Atom Processor S1200 PCI Express Root Port 3
 	0c49  Atom Processor S1200 PCI Express Root Port 4
 	0c4e  Atom Processor S1200 NTB Primary
+	0c50  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QuickData Technology Device
+	0c51  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QuickData Technology Device
+	0c52  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QuickData Technology Device
+	0c53  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QuickData Technology Device
 	0c54  Atom Processor S1200 Internal
 	0c55  Atom Processor S1200 DFX 1
 	0c56  Atom Processor S1200 DFX 2
@@ -20858,7 +21318,7 @@
 		8086 1199  PRO/1000 GT Quad Port Server Adapter
 	10b6  82598 10GbE PCI-Express Ethernet Controller
 	10b9  82572EI Gigabit Ethernet Controller (Copper)
-		103c 704a  HP 110T PCIe Gigabit Server Adapter
+		103c 704a  110T PCIe Gigabit Server Adapter
 		8086 1083  PRO/1000 PT Desktop Adapter
 		8086 1093  PRO/1000 PT Desktop Adapter
 	10ba  80003ES2LAN Gigabit Ethernet Controller (Copper)
@@ -20986,6 +21446,7 @@
 		108e 7b11  Ethernet Server Adapter X520-2
 		1734 11a9  10 Gigabit Dual Port Network Connection
 		17aa 1071  ThinkServer X520-2 AnyFabric
+		17aa 4007  82599ES 10-Gigabit SFI/SFP+ Network Connection
 		8086 0002  Ethernet Server Adapter X520-DA2
 		8086 0003  Ethernet Server Adapter X520-2
 		8086 0006  Ethernet Server Adapter X520-1
@@ -21272,6 +21733,7 @@
 		1093 775b  PCIe-8237 Ethernet Adapter
 		10a9 802a  UV2-BaseIO dual-port GbE
 		17aa 1074  ThinkServer I350-T4 AnyFabric
+		17aa 4005  I350 Gigabit Network Connection
 		8086 0001  Ethernet Server Adapter I350-T4
 		8086 0002  Ethernet Server Adapter I350-T2
 		8086 00a1  Ethernet Server Adapter I350-T4
@@ -21309,16 +21771,19 @@
 		103c 192d  561FLR-T 2-port 10Gb Ethernet Adapter
 		103c 2004  Ethernet 10Gb 2-port 561i Adapter
 		103c 211a  Ethernet 10Gb 2-port 561T Adapter
+		108e 4853  Ethernet Controller 10-Gigabit X540-AT2
 		108e 7b14  Sun Dual Port 10 GbE PCIe 2.0 ExpressModule, Base-T
 		108e 7b15  Sun Dual Port 10 GbE PCIe 2.0 Low Profile Adapter, Base-T
 		1137 00bf  Ethernet Converged Network Adapter X540-T2
 		17aa 1073  ThinkServer X540-T2 AnyFabric
+		17aa 4006  Ethernet Controller 10-Gigabit X540-AT2
 		8086 0001  Ethernet Converged Network Adapter X540-T2
 		8086 0002  Ethernet Converged Network Adapter X540-T1
 		8086 001a  Ethernet Converged Network Adapter X540-T2
 		8086 00a2  Ethernet Converged Network Adapter X540-T1
 		8086 1f61  Ethernet 10G 4P X540/I350 rNDC
 		8086 5003  Ethernet 10G 2P X540-t Adapter
+		8086 5004  Ethernet 10G 2P X540-t Adapter
 	1529  82599 10 Gigabit Dual Port Network Connection with FCoE
 	152a  82599 10 Gigabit Dual Port Backplane Connection with FCoE
 	1533  I210 Gigabit Network Connection
@@ -21347,6 +21812,7 @@
 	154d  Ethernet 10G 2P X520 Adapter
 		8086 7b11  10GbE 2P X520 Adapter
 	1557  82599 10 Gigabit Network Connection
+		17aa 4008  82599EN 10 Gigabit Network Connection
 		8086 0001  Ethernet OCP Server Adapter X520-1
 	1558  Ethernet Converged Network Adapter X520-Q1
 		8086 011a  Ethernet Converged Network Adapter X520-Q1
@@ -21360,15 +21826,24 @@
 		8086 0001  Ethernet Server Bypass Adapter X520-SR2
 		8086 0002  Ethernet Server Bypass Adapter X520-LR2
 	1560  Ethernet Controller X540
+	1563  Ethernet Controller 10G X550T
+		8086 0001  Ethernet Converged Network Adapter X550-T2
+		8086 001a  Ethernet Converged Network Adapter X550-T2
 	156f  Ethernet Connection I219-LM
 	1570  Ethernet Connection I219-V
 	1571  XL710/X710 Virtual Function
 	1572  Ethernet Controller X710 for 10GbE SFP+
+		1028 0000  Ethernet 10G X710 rNDC
 		1028 1f99  Ethernet 10G 4P X710/I350 rNDC
+		1028 1f9c  Ethernet 10G 4P X710 SFP+ rNDC
+		103c 0000  HPE Ethernet 10Gb 562SFP+ Adapter
+		103c 22fc  HPE Ethernet 10Gb 2-port 562FLR-SFP+ Adapter
+		103c 22fd  HPE Ethernet 10Gb 2-port 562SFP+ Adapter
 		1137 0000  Ethernet Converged NIC X710-4
 		1137 013b  Ethernet Converged NIC X710-4
-		17aa 0000  ThinkServer XL710 AnyFabric
-		17aa 4001  ThinkServer XL710-4 AnyFabric
+		17aa 0000  ThinkServer X710 AnyFabric for 10GbE SFP+
+		17aa 4001  ThinkServer X710-4 AnyFabric for 10GbE SFP+
+		17aa 4002  ThinkServer X710-2 AnyFabric for 10GbE SFP+
 		8086 0000  Ethernet Converged Network Adapter X710
 		8086 0001  Ethernet Converged Network Adapter X710-4
 		8086 0002  Ethernet Converged Network Adapter X710-4
@@ -21377,40 +21852,69 @@
 		8086 0006  Ethernet 10G 2P X710 Adapter
 		8086 0007  Ethernet Converged Network Adapter X710-2
 		8086 0008  Ethernet Converged Network Adapter X710-2
+		8086 0009  Ethernet Controller X710 for 10GbE SFP+
+		8086 000a  Ethernet Controller X710 for 10GbE SFP+
+		8086 000d  Ethernet Controller X710 for 10GbE SFP+
+		8086 4005  Ethernet Controller XL710 for 10 Gigabit SFP+
+		8086 4006  Ethernet Controller X710 for 10GbE SFP+
 	157b  I210 Gigabit Network Connection
 	157c  I210 Gigabit Backplane Connection
 	1580  Ethernet Controller XL710 for 40GbE backplane
 	1581  Ethernet Controller X710 for 10GbE backplane
+		1028 0000  Ethernet 10G X710-k bNDC
 		1028 1f98  Ethernet 10G 4P X710-k bNDC
+		1028 1f9e  Ethernet 10G 2P X710-k bNDC
+		8086 0000  Ethernet Converged Network Adapter XL710-Q2
 	1583  Ethernet Controller XL710 for 40GbE QSFP+
-		108e 0000  Oracle 10 Gb and 40 Gb Ethernet Adapter
-		108e 7b1b  Oracle 10 Gb and 40 Gb Ethernet Adapter
+		1028 0000  Ethernet 40G 2P XL710 QSFP+ rNDC
+		1028 1f9f  Ethernet 40G 2P XL710 QSFP+ rNDC
+		108e 0000  Quad 10Gb Ethernet Adapter
+		108e 7b1b  Quad 10Gb Ethernet Adapter
 		1137 0000  Ethernet Converged NIC XL710-Q2
 		1137 013c  Ethernet Converged NIC XL710-Q2
 		8086 0000  Ethernet Converged Network Adapter XL710-Q2
 		8086 0001  Ethernet Converged Network Adapter XL710-Q2
 		8086 0002  Ethernet Converged Network Adapter XL710-Q2
 		8086 0003  Ethernet I/O Module XL710-Q2
+		8086 0004  Ethernet Server Adapter XL710-Q2OCP
+		8086 0006  Ethernet Converged Network Adapter XL710-Q2
 	1584  Ethernet Controller XL710 for 40GbE QSFP+
 		8086 0000  Ethernet Converged Network Adapter XL710-Q1
 		8086 0001  Ethernet Converged Network Adapter XL710-Q1
 		8086 0002  Ethernet Converged Network Adapter XL710-Q1
 		8086 0003  Ethernet I/O Module XL710-Q1
+		8086 0004  Ethernet Server Adapter XL710-Q1OCP
 	1585  Ethernet Controller X710 for 10GbE QSFP+
 	1586  Ethernet Controller X710 for 10GBASE-T
 		108e 0000  Ethernet Controller X710 for 10GBASE-T
 		108e 4857  Ethernet Controller X710 for 10GBASE-T
+	1587  Ethernet Controller XL710 for 20GbE backplane
+		103c 0000  HP Flex-20 20Gb 2-port 660FLB Adapter
+		103c 22fe  HP Flex-20 20Gb 2-port 660FLB Adapter
+	1588  Ethernet Controller XL710 for 20GbE backplane
+		103c 0000  HP Flex-20 20Gb 2-port 660M Adapter
+		103c 22ff  HP Flex-20 20Gb 2-port 660M Adapter
+	1589  Ethernet Controller X710/X557-AT 10GBASE-T
+		8086 0000  Ethernet Converged Network Adapter X710-T
+		8086 0001  Ethernet Converged Network Adapter X710-T4
+		8086 0002  Ethernet Converged Network Adapter X710-T4
 	15a0  Ethernet Connection (2) I218-LM
 	15a1  Ethernet Connection (2) I218-V
 	15a2  Ethernet Connection (3) I218-LM
 	15a3  Ethernet Connection (3) I218-V
+	15a4  Ethernet Switch FM10000 Host Interface
+	15a5  Ethernet Switch FM10000 Host Virtual Interface
 	15a8  Ethernet Connection X552 Virtual Function
 	15aa  Ethernet Connection X552 10 GbE Backplane
 	15ab  Ethernet Connection X552 10 GbE Backplane
 	15ac  Ethernet Connection X552 10 GbE SFP+
 	15ad  Ethernet Connection X552/X557-AT 10GBASE-T
+	15ae  Ethernet Connection X552 1000BASE-T
 	15b7  Ethernet Connection (2) I219-LM
 	15b8  Ethernet Connection (2) I219-V
+	15d1  Ethernet Controller 10G X550T
+		8086 0002  Ethernet Converged Network Adapter X550-T1
+		8086 00a2  Ethernet Converged Network Adapter X550-T1
 	1600  Broadwell-U Host Bridge -OPI
 	1601  Broadwell-U PCI Express x16 Controller
 	1602  Broadwell-U Integrated Graphics
@@ -21431,6 +21935,7 @@
 	1612  Broadwell-U Integrated Graphics
 	1614  Broadwell-U Host Bridge - DMI
 	1616  Broadwell-U Integrated Graphics
+		103c 2216  ZBook 15u G2 Mobile Workstation
 	1618  Broadwell-U Host Bridge - DMI
 	161a  Broadwell-U Integrated Graphics
 	161b  Broadwell-U Integrated Graphics
@@ -21499,6 +22004,7 @@
 	1a24  82840 840 [Carmel] Chipset PCI Bridge (Hub B)
 	1a30  82845 845 [Brookdale] Chipset Host Bridge
 		1028 010e  Optiplex GX240
+		147b 0505  BL7 motherboard
 		15d9 3280  Supermicro P4SBE Mainboard
 	1a31  82845 845 [Brookdale] Chipset AGP Bridge
 	1a38  5000 Series Chipset DMA Engine
@@ -21836,8 +22342,8 @@
 	1f14  Atom processor C2000 RAS
 	1f15  Atom processor C2000 SMBus 2.0
 	1f16  Atom processor C2000 RCEC
-	1f18  Atom processor C2000 nCPM
-	1f19  Atom processor C2000 nCPM
+	1f18  Atom processor C2000 QAT
+	1f19  Atom processor C2000 QAT
 	1f20  Atom processor C2000 4-Port IDE SATA2 Controller
 	1f21  Atom processor C2000 4-Port IDE SATA2 Controller
 	1f22  Atom processor C2000 AHCI SATA2 Controller
@@ -21928,26 +22434,26 @@
 	2360  DH89xxCC Watchdog Timer
 	2364  DH89xxCC MEI 0
 	2365  DH89xxCC MEI 1
-	2390  Coleto Creek LPC Controller
-	23a1  Coleto Creek 2-Port SATA Controller [IDE Mode]
-	23a3  Coleto Creek 4-Port SATA Controller [AHCI Mode]
-	23a6  Coleto Creek 2-Port SATA Controller [IDE Mode]
-	23b0  Coleto Creek SMBus Controller
-	23b1  Coleto Creek CHAP Counter
-	23b2  Coleto Creek Thermal Management Controller
-	23b4  Coleto Creek USB2 Enhanced Host Controller #1
-	23b5  Coleto Creek USB2 Enhanced Host Controller #1
-	23c2  Coleto Creek PCI Express Root Port #1
-	23c3  Coleto Creek PCI Express Root Port #1
-	23c4  Coleto Creek PCI Express Root Port #2
-	23c5  Coleto Creek PCI Express Root Port #2
-	23c6  Coleto Creek PCI Express Root Port #3
-	23c7  Coleto Creek PCI Express Root Port #3
-	23c8  Coleto Creek PCI Express Root Port #4
-	23c9  Coleto Creek PCI Express Root Port #4
-	23e0  Coleto Creek Watchdog Timer
-	23e4  Coleto Creek MEI Controller #1
-	23e5  Coleto Creek MEI Controller #2
+	2390  DH895XCC Series LPC Controller
+	23a1  DH895XCC Series 2-Port SATA Controller [IDE Mode]
+	23a3  DH895XCC Series 4-Port SATA Controller [AHCI Mode]
+	23a6  DH895XCC Series 2-Port SATA Controller [IDE Mode]
+	23b0  DH895XCC Series SMBus Controller
+	23b1  DH895XCC Series CHAP Counter
+	23b2  DH895XCC Series Thermal Management Controller
+	23b4  DH895XCC Series USB2 Enhanced Host Controller #1
+	23b5  DH895XCC Series USB2 Enhanced Host Controller #1
+	23c2  DH895XCC Series PCI Express Root Port #1
+	23c3  DH895XCC Series PCI Express Root Port #1
+	23c4  DH895XCC Series PCI Express Root Port #2
+	23c5  DH895XCC Series PCI Express Root Port #2
+	23c6  CDH895XCC Series PCI Express Root Port #3
+	23c7  DH895XCC Series PCI Express Root Port #3
+	23c8  DH895XCC Series PCI Express Root Port #4
+	23c9  DH895XCC Series PCI Express Root Port #4
+	23e0  DH895XCC Series Watchdog Timer
+	23e4  DH895XCC Series MEI Controller #1
+	23e5  DH895XCC Series MEI Controller #2
 	2410  82801AA ISA Bridge (LPC)
 	2411  82801AA IDE Controller
 	2412  82801AA USB Controller
@@ -21974,7 +22480,7 @@
 	2428  82801AB PCI Bridge
 	2440  82801BA ISA Bridge (LPC)
 		8086 5744  S845WD1-E
-	2442  82801BA/BAM USB Controller #1
+	2442  82801BA/BAM UHCI USB 1.1 Controller #1
 		1014 01c6  Netvista A40/A40p
 		1025 1016  Travelmate 612 TX
 		1028 00c7  Dimension 8100
@@ -21983,6 +22489,7 @@
 		103c 126f  e-pc 40
 		1043 8027  TUSL2-C Mainboard
 		104d 80df  Vaio PCG-FX403
+		147b 0505  BL7 motherboard
 		147b 0507  TH7II-RAID
 		8086 4532  D815EEA2 mainboard
 		8086 4557  D815EGEW Mainboard
@@ -21996,12 +22503,13 @@
 		103c 126f  e-pc 40
 		1043 8027  TUSL2-C Mainboard
 		104d 80df  Vaio PCG-FX403
+		147b 0505  BL7 motherboard
 		147b 0507  TH7II-RAID
 		15d9 3280  Supermicro P4SBE Mainboard
 		8086 4532  D815EEA2 mainboard
 		8086 4557  D815EGEW Mainboard
 		8086 5744  S845WD1-E mainboard
-	2444  82801BA/BAM USB Controller #1
+	2444  82801BA/BAM UHCI USB 1.1 Controller #2
 		1025 1016  Travelmate 612 TX
 		1028 00c7  Dimension 8100
 		1028 00d8  Precision 530
@@ -22009,6 +22517,7 @@
 		103c 126f  e-pc 40
 		1043 8027  TUSL2-C Mainboard
 		104d 80df  Vaio PCG-FX403
+		147b 0505  BL7 motherboard
 		147b 0507  TH7II-RAID
 		8086 4532  D815EEA2 mainboard
 		8086 5744  S845WD1-E mainboard
@@ -22021,14 +22530,16 @@
 		103c 126f  e-pc 40
 		104d 80df  Vaio PCG-FX403
 		1462 3370  STAC9721 AC
+		147b 0505  BL7 motherboard
 		147b 0507  TH7II-RAID
 		8086 4557  D815EGEW Mainboard
 	2446  82801BA/BAM AC'97 Modem Controller
 		1025 1016  Travelmate 612 TX
 		104d 80df  Vaio PCG-FX403
 	2448  82801 Mobile PCI Bridge
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
-		103c 0934  HP Compaq nw8240 Mobile Workstation
+		103c 0934  Compaq nw8240 Mobile Workstation
 		103c 099c  NX6110/NC6120
 		103c 309f  Compaq nx9420 Notebook
 		103c 30a3  Compaq nw8440
@@ -22088,6 +22599,7 @@
 		1028 010e  Optiplex GX240
 		103c 126f  e-pc 40
 		1043 8027  TUSL2-C Mainboard
+		147b 0505  BL7 motherboard
 		147b 0507  TH7II-RAID
 		15d9 3280  Supermicro P4SBE Mainboard
 		8086 4532  D815EEA2 mainboard
@@ -22182,6 +22694,7 @@
 		1014 0267  NetVista A30p
 		1014 052d  ThinkPad
 		1025 005a  TravelMate 290
+		1025 0064  Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
 		1028 0126  Optiplex GX260
 		1028 0163  Latitude D505
 		1028 018d  Inspiron 700m/710m
@@ -22207,6 +22720,7 @@
 		1014 0267  NetVista A30p
 		1014 052d  ThinkPad
 		1025 005a  TravelMate 290
+		1025 0064  Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
 		1028 0126  Optiplex GX260
 		1028 014f  Latitude X300
 		1028 018d  Inspiron 700m/710m
@@ -22228,6 +22742,7 @@
 		1014 0267  NetVista A30p
 		1014 052d  ThinkPad
 		1025 005a  TravelMate 290
+		1025 0064  Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
 		1028 0126  Optiplex GX260
 		1028 0163  Latitude D505
 		1028 018d  Inspiron 700m/710m
@@ -22252,6 +22767,7 @@
 		1014 0537  ThinkPad T4x Series
 		1014 055f  Thinkpad R50e model 1634
 		1025 005a  TravelMate 290
+		1025 0064  Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
 		1028 0139  Latitude D400
 		1028 014f  Latitude X300
 		1028 0152  Latitude D500
@@ -22278,6 +22794,7 @@
 		1014 0559  ThinkPad R50e
 		1025 003c  Aspire 2001WLCi (Compal CL50 motherboard) implementation
 		1025 005a  TravelMate 290
+		1025 0064  Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
 		1028 0196  Inspiron 5160
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
@@ -22294,6 +22811,7 @@
 		1014 0267  NetVista A30p
 		1014 052d  ThinkPad
 		1025 005a  TravelMate 290
+		1025 0064  Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
 		1028 0126  Optiplex GX260
 		1028 0163  Latitude D505
 		1028 018d  Inspiron 700m/710m
@@ -22315,6 +22833,7 @@
 	24ca  82801DBM (ICH4-M) IDE Controller
 		1014 052d  ThinkPad
 		1025 005a  TravelMate 290
+		1025 0064  Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
 		1028 014f  Latitude X300
 		1028 0163  Latitude D505
 		1028 018d  Inspiron 700m/710m
@@ -22345,6 +22864,7 @@
 		1014 0267  NetVista A30p
 		1014 052e  ThinkPad
 		1025 005a  TravelMate 290
+		1025 0064  Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
 		1028 011d  Latitude D600
 		1028 0126  Optiplex GX260
 		1028 0139  Latitude D400
@@ -22555,6 +23075,8 @@
 		8086 524c  D865PERL mainboard
 	24df  82801ER (ICH5R) SATA Controller
 		1028 0168  Precision Workstation 670 Mainboard
+	24f0  Omni-Path HFI Silicon 100 Series [discrete]
+	24f1  Omni-Path HFI Silicon 100 Series [integrated]
 	24f3  Wireless 8260
 # Snow Field Peak AC
 		8086 0010  Dual Band Wireless-AC 8260
@@ -22662,7 +23184,7 @@
 		e4bf 0cd3  CD3-JIVE
 		e4bf 58b1  XB1
 	2591  Mobile 915GM/PM Express PCI Express Root Port
-		103c 0934  HP Compaq nw8240 Mobile Workstation
+		103c 0934  Compaq nw8240 Mobile Workstation
 	2592  Mobile 915GM/GMS/910GML Express Graphics Controller
 		103c 099c  NX6110/NC6120
 		103c 308a  NC6220
@@ -22912,13 +23434,13 @@
 		e4bf 0cd3  CD3-JIVE
 		e4bf 58b1  XB1
 	2660  82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1
-		103c 0934  HP Compaq nw8240 Mobile Workstation
+		103c 0934  Compaq nw8240 Mobile Workstation
 		103c 099c  NX6110/NC6120
 		e4bf 0ccd  CCD-CALYPSO
 		e4bf 0cd3  CD3-JIVE
 		e4bf 58b1  XB1
 	2662  82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 2
-		103c 0934  HP Compaq nw8240 Mobile Workstation
+		103c 0934  Compaq nw8240 Mobile Workstation
 		e4bf 0ccd  CCD-CALYPSO
 		e4bf 0cd3  CD3-JIVE
 		e4bf 58b1  XB1
@@ -23405,6 +23927,7 @@
 	2822  SATA Controller [RAID mode]
 		1028 020d  Inspiron 530
 		103c 2a6f  Asus IPIBL-LB Motherboard
+		1043 8277  P5K PRO Motherboard
 	2823  C610/X99 series chipset sSATA Controller [RAID mode]
 	2824  82801HB (ICH8) 4 port SATA Controller [AHCI mode]
 		1043 81ec  P5B
@@ -23578,7 +24101,7 @@
 		1028 01f9  Dell Latitude D630
 		1028 01ff  Dell Precision M4300
 		1028 0256  Studio 1735
-		103c 2802  HP Compaq dc7700p
+		103c 2802  Compaq dc7700p
 		103c 30c0  Compaq 6710b
 		103c 30c1  Compaq 6910p
 		103c 30cc  Pavilion dv6700
@@ -23634,6 +24157,7 @@
 		1028 0237  PowerEdge T610 SATA IDE Controller
 		1462 7360  G33/P35 Neo
 	2922  82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA Controller [AHCI mode]
+		1043 8277  P5K PRO Motherboard
 		1af4 1100  QEMU Virtual Machine
 		8086 5044  Desktop Board DP35DP
 	2923  82801IB (ICH9) 4 port SATA Controller [AHCI mode]
@@ -24214,165 +24738,165 @@
 	2e94  4 Series Chipset HECI Controller
 	2e95  4 Series Chipset HECI Controller
 	2e96  4 Series Chipset PT IDER Controller
-	2f00  Xeon E5 v3/Core i7 DMI2
-	2f01  Xeon E5 v3/Core i7 PCI Express Root Port 0
-	2f02  Xeon E5 v3/Core i7 PCI Express Root Port 1
-	2f03  Xeon E5 v3/Core i7 PCI Express Root Port 1
-	2f04  Xeon E5 v3/Core i7 PCI Express Root Port 2
-	2f05  Xeon E5 v3/Core i7 PCI Express Root Port 2
-	2f06  Xeon E5 v3/Core i7 PCI Express Root Port 2
-	2f07  Xeon E5 v3/Core i7 PCI Express Root Port 2
-	2f08  Xeon E5 v3/Core i7 PCI Express Root Port 3
-	2f09  Xeon E5 v3/Core i7 PCI Express Root Port 3
-	2f0a  Xeon E5 v3/Core i7 PCI Express Root Port 3
-	2f0b  Xeon E5 v3/Core i7 PCI Express Root Port 3
-	2f10  Xeon E5 v3/Core i7 IIO Debug
-	2f11  Xeon E5 v3/Core i7 IIO Debug
-	2f12  Xeon E5 v3/Core i7 IIO Debug
-	2f13  Xeon E5 v3/Core i7 IIO Debug
-	2f14  Xeon E5 v3/Core i7 IIO Debug
-	2f15  Xeon E5 v3/Core i7 IIO Debug
-	2f16  Xeon E5 v3/Core i7 IIO Debug
-	2f17  Xeon E5 v3/Core i7 IIO Debug
-	2f18  Xeon E5 v3/Core i7 IIO Debug
-	2f19  Xeon E5 v3/Core i7 IIO Debug
-	2f1a  Xeon E5 v3/Core i7 IIO Debug
-	2f1b  Xeon E5 v3/Core i7 IIO Debug
-	2f1c  Xeon E5 v3/Core i7 IIO Debug
-	2f1d  Xeon E5 v3/Core i7 PCIe Ring Interface
-	2f1e  Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
-	2f1f  Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
-	2f20  Xeon E5 v3/Core i7 DMA Channel 0
-	2f21  Xeon E5 v3/Core i7 DMA Channel 1
-	2f22  Xeon E5 v3/Core i7 DMA Channel 2
-	2f23  Xeon E5 v3/Core i7 DMA Channel 3
-	2f24  Xeon E5 v3/Core i7 DMA Channel 4
-	2f25  Xeon E5 v3/Core i7 DMA Channel 5
-	2f26  Xeon E5 v3/Core i7 DMA Channel 6
-	2f27  Xeon E5 v3/Core i7 DMA Channel 7
-	2f28  Xeon E5 v3/Core i7 Address Map, VTd_Misc, System Management
-	2f29  Xeon E5 v3/Core i7 Hot Plug
-	2f2a  Xeon E5 v3/Core i7 RAS, Control Status and Global Errors
-	2f2c  Xeon E5 v3/Core i7 I/O APIC
-	2f2e  Xeon E5 v3/Core i7 RAID 5/6
-	2f2f  Xeon E5 v3/Core i7 RAID 5/6
-	2f30  Xeon E5 v3/Core i7 Home Agent 0
-	2f32  Xeon E5 v3/Core i7 QPI Link 0
-	2f33  Xeon E5 v3/Core i7 QPI Link 1
-	2f34  Xeon E5 v3/Core i7 PCIe Ring Interface
-	2f36  Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
-	2f37  Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
-	2f38  Xeon E5 v3/Core i7 Home Agent 1
-	2f39  Xeon E5 v3/Core i7 I/O Performance Monitoring
-	2f3a  Xeon E5 v3/Core i7 QPI Link 2
-	2f3e  Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
-	2f3f  Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
-	2f40  Xeon E5 v3/Core i7 QPI Link 2
-	2f41  Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
-	2f43  Xeon E5 v3/Core i7 QPI Link 2
-	2f45  Xeon E5 v3/Core i7 QPI Link 2 Debug
-	2f46  Xeon E5 v3/Core i7 QPI Link 2 Debug
-	2f47  Xeon E5 v3/Core i7 QPI Link 2 Debug
-	2f60  Xeon E5 v3/Core i7 Home Agent 1
-	2f68  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
-	2f6a  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
-	2f6b  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
-	2f6c  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
-	2f6d  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
-	2f6e  Xeon E5 v3/Core i7 DDRIO Channel 2/3 Broadcast
-	2f6f  Xeon E5 v3/Core i7 DDRIO Global Broadcast
-	2f70  Xeon E5 v3/Core i7 Home Agent 0 Debug
-	2f71  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
-	2f76  Xeon E5 v3/Core i7 E3 QPI Link Debug
-	2f78  Xeon E5 v3/Core i7 Home Agent 1 Debug
-	2f79  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
-	2f7d  Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
-	2f7e  Xeon E5 v3/Core i7 E3 QPI Link Debug
-	2f80  Xeon E5 v3/Core i7 QPI Link 0
-	2f81  Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
-	2f83  Xeon E5 v3/Core i7 QPI Link 0
-	2f85  Xeon E5 v3/Core i7 QPI Link 0 Debug
-	2f86  Xeon E5 v3/Core i7 QPI Link 0 Debug
-	2f87  Xeon E5 v3/Core i7 QPI Link 0 Debug
-	2f88  Xeon E5 v3/Core i7 VCU
-	2f8a  Xeon E5 v3/Core i7 VCU
-	2f90  Xeon E5 v3/Core i7 QPI Link 1
-	2f93  Xeon E5 v3/Core i7 QPI Link 1
-	2f95  Xeon E5 v3/Core i7 QPI Link 1 Debug
-	2f96  Xeon E5 v3/Core i7 QPI Link 1 Debug
-	2f98  Xeon E5 v3/Core i7 Power Control Unit
-	2f99  Xeon E5 v3/Core i7 Power Control Unit
-	2f9a  Xeon E5 v3/Core i7 Power Control Unit
-	2f9c  Xeon E5 v3/Core i7 Power Control Unit
-	2fa0  Xeon E5 v3/Core i7 Home Agent 0
-	2fa8  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
-	2faa  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
-	2fab  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
-	2fac  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
-	2fad  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
-	2fae  Xeon E5 v3/Core i7 DDRIO Channel 0/1 Broadcast
-	2faf  Xeon E5 v3/Core i7 DDRIO Global Broadcast
-	2fb0  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 Thermal Control
-	2fb1  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 Thermal Control
-	2fb2  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 ERROR Registers
-	2fb3  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 ERROR Registers
-	2fb4  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 Thermal Control
-	2fb5  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 Thermal Control
-	2fb6  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 ERROR Registers
-	2fb7  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 ERROR Registers
-	2fb8  Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
-	2fb9  Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
-	2fba  Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
-	2fbb  Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
-	2fbc  Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
-	2fbd  Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
-	2fbe  Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
-	2fbf  Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
-	2fc0  Xeon E5 v3/Core i7 Power Control Unit
-	2fc1  Xeon E5 v3/Core i7 Power Control Unit
-	2fc2  Xeon E5 v3/Core i7 Power Control Unit
-	2fc3  Xeon E5 v3/Core i7 Power Control Unit
-	2fc4  Xeon E5 v3/Core i7 Power Control Unit
-	2fc5  Xeon E5 v3/Core i7 Power Control Unit
-	2fd0  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 Thermal Control
-	2fd1  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 Thermal Control
-	2fd2  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 ERROR Registers
-	2fd3  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 ERROR Registers
-	2fd4  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 Thermal Control
-	2fd5  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 Thermal Control
-	2fd6  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 ERROR Registers
-	2fd7  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 ERROR Registers
-	2fe0  Xeon E5 v3/Core i7 Unicast Registers
-	2fe1  Xeon E5 v3/Core i7 Unicast Registers
-	2fe2  Xeon E5 v3/Core i7 Unicast Registers
-	2fe3  Xeon E5 v3/Core i7 Unicast Registers
-	2fe4  Xeon E5 v3/Core i7 Unicast Registers
-	2fe5  Xeon E5 v3/Core i7 Unicast Registers
-	2fe6  Xeon E5 v3/Core i7 Unicast Registers
-	2fe7  Xeon E5 v3/Core i7 Unicast Registers
-	2fe8  Xeon E5 v3/Core i7 Unicast Registers
-	2fe9  Xeon E5 v3/Core i7 Unicast Registers
-	2fea  Xeon E5 v3/Core i7 Unicast Registers
-	2feb  Xeon E5 v3/Core i7 Unicast Registers
-	2fec  Xeon E5 v3/Core i7 Unicast Registers
-	2fed  Xeon E5 v3/Core i7 Unicast Registers
-	2fee  Xeon E5 v3/Core i7 Unicast Registers
-	2fef  Xeon E5 v3/Core i7 Unicast Registers
-	2ff0  Xeon E5 v3/Core i7 Unicast Registers
-	2ff1  Xeon E5 v3/Core i7 Unicast Registers
-	2ff2  Xeon E5 v3/Core i7 Unicast Registers
-	2ff3  Xeon E5 v3/Core i7 Unicast Registers
-	2ff4  Xeon E5 v3/Core i7 Unicast Registers
-	2ff5  Xeon E5 v3/Core i7 Unicast Registers
-	2ff6  Xeon E5 v3/Core i7 Unicast Registers
-	2ff7  Xeon E5 v3/Core i7 Unicast Registers
-	2ff8  Xeon E5 v3/Core i7 Buffered Ring Agent
-	2ff9  Xeon E5 v3/Core i7 Buffered Ring Agent
-	2ffa  Xeon E5 v3/Core i7 Buffered Ring Agent
-	2ffb  Xeon E5 v3/Core i7 Buffered Ring Agent
-	2ffc  Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
-	2ffd  Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
-	2ffe  Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+	2f00  Xeon E7 v3/Xeon E5 v3/Core i7 DMI2
+	2f01  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 0
+	2f02  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 1
+	2f03  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 1
+	2f04  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
+	2f05  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
+	2f06  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
+	2f07  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
+	2f08  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
+	2f09  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
+	2f0a  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
+	2f0b  Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
+	2f10  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f11  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f12  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f13  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f14  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f15  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f16  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f17  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f18  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f19  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f1a  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f1b  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f1c  Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+	2f1d  Xeon E7 v3/Xeon E5 v3/Core i7 PCIe Ring Interface
+	2f1e  Xeon E7 v3/Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+	2f1f  Xeon E7 v3/Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+	2f20  Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 0
+	2f21  Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 1
+	2f22  Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 2
+	2f23  Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 3
+	2f24  Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 4
+	2f25  Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 5
+	2f26  Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 6
+	2f27  Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 7
+	2f28  Xeon E7 v3/Xeon E5 v3/Core i7 Address Map, VTd_Misc, System Management
+	2f29  Xeon E7 v3/Xeon E5 v3/Core i7 Hot Plug
+	2f2a  Xeon E7 v3/Xeon E5 v3/Core i7 RAS, Control Status and Global Errors
+	2f2c  Xeon E7 v3/Xeon E5 v3/Core i7 I/O APIC
+	2f2e  Xeon E7 v3/Xeon E5 v3/Core i7 RAID 5/6
+	2f2f  Xeon E7 v3/Xeon E5 v3/Core i7 RAID 5/6
+	2f30  Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 0
+	2f32  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0
+	2f33  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1
+	2f34  Xeon E7 v3/Xeon E5 v3/Core i7 PCIe Ring Interface
+	2f36  Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+	2f37  Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+	2f38  Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 1
+	2f39  Xeon E7 v3/Xeon E5 v3/Core i7 I/O Performance Monitoring
+	2f3a  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2
+	2f3e  Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+	2f3f  Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+	2f40  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2
+	2f41  Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+	2f43  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2
+	2f45  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2 Debug
+	2f46  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2 Debug
+	2f47  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2 Debug
+	2f60  Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 1
+	2f68  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
+	2f6a  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+	2f6b  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+	2f6c  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+	2f6d  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+	2f6e  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Channel 2/3 Broadcast
+	2f6f  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Global Broadcast
+	2f70  Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 0 Debug
+	2f71  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
+	2f76  Xeon E7 v3/Xeon E5 v3/Core i7 E3 QPI Link Debug
+	2f78  Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 1 Debug
+	2f79  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
+	2f7d  Xeon E7 v3/Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+	2f7e  Xeon E7 v3/Xeon E5 v3/Core i7 E3 QPI Link Debug
+	2f80  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0
+	2f81  Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+	2f83  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0
+	2f85  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0 Debug
+	2f86  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0 Debug
+	2f87  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0 Debug
+	2f88  Xeon E7 v3/Xeon E5 v3/Core i7 VCU
+	2f8a  Xeon E7 v3/Xeon E5 v3/Core i7 VCU
+	2f90  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1
+	2f93  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1
+	2f95  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1 Debug
+	2f96  Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1 Debug
+	2f98  Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+	2f99  Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+	2f9a  Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+	2f9c  Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+	2fa0  Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 0
+	2fa8  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
+	2faa  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+	2fab  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+	2fac  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+	2fad  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+	2fae  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Channel 0/1 Broadcast
+	2faf  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Global Broadcast
+	2fb0  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 Thermal Control
+	2fb1  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 Thermal Control
+	2fb2  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 ERROR Registers
+	2fb3  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 ERROR Registers
+	2fb4  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 Thermal Control
+	2fb5  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 Thermal Control
+	2fb6  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 ERROR Registers
+	2fb7  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 ERROR Registers
+	2fb8  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+	2fb9  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+	2fba  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+	2fbb  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+	2fbc  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+	2fbd  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+	2fbe  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+	2fbf  Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+	2fc0  Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+	2fc1  Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+	2fc2  Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+	2fc3  Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+	2fc4  Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+	2fc5  Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+	2fd0  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 Thermal Control
+	2fd1  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 Thermal Control
+	2fd2  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 ERROR Registers
+	2fd3  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 ERROR Registers
+	2fd4  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 Thermal Control
+	2fd5  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 Thermal Control
+	2fd6  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 ERROR Registers
+	2fd7  Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 ERROR Registers
+	2fe0  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fe1  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fe2  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fe3  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fe4  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fe5  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fe6  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fe7  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fe8  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fe9  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fea  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2feb  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fec  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fed  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fee  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2fef  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2ff0  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2ff1  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2ff2  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2ff3  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2ff4  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2ff5  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2ff6  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2ff7  Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+	2ff8  Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
+	2ff9  Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
+	2ffa  Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
+	2ffb  Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
+	2ffc  Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+	2ffd  Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+	2ffe  Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
 	3165  Wireless 3165
 # Stone Peak 1x1
 		8086 4010  Dual Band Wireless AC 3165
@@ -24482,6 +25006,7 @@
 	3578  82830M/MG/MP Host Bridge
 	3580  82852/82855 GM/GME/PM/GMV Processor to I/O Controller
 		1014 055c  ThinkPad R50e
+		1025 0064  Extensa 3000 series laptop
 		1028 0139  Latitude D400
 		1028 014f  Latitude X300
 		1028 0152  Latitude D500
@@ -24514,6 +25039,7 @@
 		e4bf 0cd2  CD2-BEBOP
 	3584  82852/82855 GM/GME/PM/GMV Processor to I/O Controller
 		1014 055d  ThinkPad R50e
+		1025 0064  Extensa 3000 series laptop
 		1028 0139  Latitude D400
 		1028 014f  Latitude X300
 		1028 0152  Latitude D500
@@ -24528,6 +25054,7 @@
 		4c53 10e0  PSL09 PrPMC
 	3585  82852/82855 GM/GME/PM/GMV Processor to I/O Controller
 		1014 055e  ThinkPad R50e
+		1025 0064  Extensa 3000 series laptop
 		1028 0139  Latitude D400
 		1028 014f  Latitude X300
 		1028 0152  Latitude D500
@@ -24770,34 +25297,35 @@
 	3a7c  82801JD/DO (ICH10 Family) Gigabit Ethernet Controller
 	3b00  5 Series/3400 Series Chipset LPC Interface Controller
 	3b01  Mobile 5 Series Chipset LPC Interface Controller
-	3b02  5 Series Chipset LPC Interface Controller
-	3b03  Mobile 5 Series Chipset LPC Interface Controller
+	3b02  P55 Chipset LPC Interface Controller
+	3b03  PM55 Chipset LPC Interface Controller
 	3b04  5 Series Chipset LPC Interface Controller
 	3b05  Mobile 5 Series Chipset LPC Interface Controller
-	3b06  5 Series Chipset LPC Interface Controller
-	3b07  Mobile 5 Series Chipset LPC Interface Controller
+	3b06  H55 Chipset LPC Interface Controller
+	3b07  QM57 Chipset LPC Interface Controller
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		e4bf 50c1  PC1-GROOVE
-	3b08  5 Series Chipset LPC Interface Controller
-	3b09  Mobile 5 Series Chipset LPC Interface Controller
+	3b08  H57 Chipset LPC Interface Controller
+	3b09  HM55 Chipset LPC Interface Controller
 		1025 0347  Aspire 7740G
 		144d c06a  R730 Laptop
 		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
-	3b0a  5 Series Chipset LPC Interface Controller
+	3b0a  Q57 Chipset LPC Interface Controller
 		1028 02da  OptiPlex 980
 		15d9 060d  C7SIM-Q Motherboard
-	3b0b  Mobile 5 Series Chipset LPC Interface Controller
+	3b0b  HM57 Chipset LPC Interface Controller
 	3b0c  5 Series Chipset LPC Interface Controller
 	3b0d  5 Series/3400 Series Chipset LPC Interface Controller
 	3b0e  5 Series/3400 Series Chipset LPC Interface Controller
-	3b0f  5 Series/3400 Series Chipset LPC Interface Controller
+	3b0f  QS57 Chipset LPC Interface Controller
 	3b10  5 Series/3400 Series Chipset LPC Interface Controller
 	3b11  5 Series/3400 Series Chipset LPC Interface Controller
 	3b12  3400 Series Chipset LPC Interface Controller
 	3b13  5 Series/3400 Series Chipset LPC Interface Controller
-	3b14  3400 Series Chipset LPC Interface Controller
+	3b14  3420 Chipset LPC Interface Controller
 	3b15  5 Series/3400 Series Chipset LPC Interface Controller
-	3b16  3400 Series Chipset LPC Interface Controller
+	3b16  3450 Chipset LPC Interface Controller
 	3b17  5 Series/3400 Series Chipset LPC Interface Controller
 	3b18  5 Series/3400 Series Chipset LPC Interface Controller
 	3b19  5 Series/3400 Series Chipset LPC Interface Controller
@@ -24814,7 +25342,7 @@
 		15d9 060d  C7SIM-Q Motherboard
 	3b23  5 Series/3400 Series Chipset 4 port SATA AHCI Controller
 	3b25  5 Series/3400 Series Chipset SATA RAID Controller
-		103c 3118  HP Smart Array B110i SATA RAID Controller
+		103c 3118  Smart Array B110i SATA RAID Controller
 	3b26  5 Series/3400 Series Chipset 2 port SATA IDE Controller
 	3b28  5 Series/3400 Series Chipset 4 port SATA IDE Controller
 		144d c06a  R730 Laptop
@@ -24831,11 +25359,13 @@
 	3b2e  5 Series/3400 Series Chipset 4 port SATA IDE Controller
 		e4bf 50c1  PC1-GROOVE
 	3b2f  5 Series/3400 Series Chipset 6 port SATA AHCI Controller
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		e4bf 50c1  PC1-GROOVE
 	3b30  5 Series/3400 Series Chipset SMBus Controller
 		1025 0347  Aspire 7740G
 		1028 02da  OptiPlex 980
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		144d c06a  R730 Laptop
 		15d9 060d  C7SIM-Q Motherboard
@@ -24843,11 +25373,13 @@
 		e4bf 50c1  PC1-GROOVE
 	3b32  5 Series/3400 Series Chipset Thermal Subsystem
 		1025 0347  Aspire 7740G
+		1028 040a  Latitude E6410
 		144d c06a  R730 Laptop
 		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
 	3b34  5 Series/3400 Series Chipset USB2 Enhanced Host Controller
 		1025 0347  Aspire 7740G
 		1028 02da  OptiPlex 980
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		144d c06a  R730 Laptop
 		15d9 060d  C7SIM-Q Motherboard
@@ -24862,6 +25394,7 @@
 	3b3c  5 Series/3400 Series Chipset USB2 Enhanced Host Controller
 		1025 0347  Aspire 7740G
 		1028 02da  OptiPlex 980
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		144d c06a  R730 Laptop
 		15d9 060d  C7SIM-Q Motherboard
@@ -24873,19 +25406,23 @@
 	3b41  5 Series/3400 Series Chipset LAN Controller
 	3b42  5 Series/3400 Series Chipset PCI Express Root Port 1
 		1028 02da  OptiPlex 980
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		144d c06a  R730 Laptop
 		15d9 060d  C7SIM-Q Motherboard
 		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
 	3b44  5 Series/3400 Series Chipset PCI Express Root Port 2
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		15d9 060d  C7SIM-Q Motherboard
 		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
 	3b46  5 Series/3400 Series Chipset PCI Express Root Port 3
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		144d c06a  R730 Laptop
 		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
 	3b48  5 Series/3400 Series Chipset PCI Express Root Port 4
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		144d c06a  R730 Laptop
 	3b4a  5 Series/3400 Series Chipset PCI Express Root Port 5
@@ -24898,6 +25435,7 @@
 	3b56  5 Series/3400 Series Chipset High Definition Audio
 		1025 0347  Aspire 7740G
 		1028 02da  OptiPlex 980
+		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		144d c06a  R730 Laptop
 		15d9 060d  C7SIM-Q Motherboard
@@ -25024,7 +25562,7 @@
 	4220  PRO/Wireless 2200BG [Calexico2] Network Connection
 		103c 0934  Compaq nw8240/nx8220
 		103c 12f6  nc6120/nx8220/nw8240
-		8086 2701  WM3B2300BG Mini-PCI Card
+		8086 2701  WM3B2200BG Mini-PCI Card
 		8086 2712  IBM ThinkPad R50e
 		8086 2721  Dell B130 laptop integrated WLAN
 		8086 2722  Dell Latitude D600
@@ -25183,167 +25721,171 @@
 	65f9  5100 Chipset PCI Express x8 Port 6-7
 	65fa  5100 Chipset PCI Express x16 Port 4-7
 	65ff  5100 Chipset DMA Engine
-	6f00  Broadwell DMI2
-	6f01  Broadwell PCI Express Root Port 0
-	6f02  Broadwell PCI Express Root Port 1
-	6f03  Broadwell PCI Express Root Port 1
-	6f04  Broadwell PCI Express Root Port 2
-	6f05  Broadwell PCI Express Root Port 2
-	6f06  Broadwell PCI Express Root Port 2
-	6f07  Broadwell PCI Express Root Port 2
-	6f08  Broadwell PCI Express Root Port 3
-	6f09  Broadwell PCI Express Root Port 3
-	6f0a  Broadwell PCI Express Root Port 3
-	6f0b  Broadwell PCI Express Root Port 3
-	6f10  Broadwell IIO Debug
-	6f11  Broadwell IIO Debug
-	6f12  Broadwell IIO Debug
-	6f13  Broadwell IIO Debug
-	6f14  Broadwell IIO Debug
-	6f15  Broadwell IIO Debug
-	6f16  Broadwell IIO Debug
-	6f17  Broadwell IIO Debug
-	6f18  Broadwell IIO Debug
-	6f19  Broadwell IIO Debug
-	6f1a  Broadwell IIO Debug
-	6f1b  Broadwell IIO Debug
-	6f1c  Broadwell IIO Debug
-	6f1d  Broadwell R2PCIe Agent
-	6f1e  Broadwell Ubox
-	6f1f  Broadwell Ubox
-	6f20  Broadwell-DE Crystal Beach DMA Channel 0
-	6f21  Broadwell-DE Crystal Beach DMA Channel 1
-	6f22  Broadwell-DE Crystal Beach DMA Channel 2
-	6f23  Broadwell-DE Crystal Beach DMA Channel 3
-	6f24  Broadwell-DE Crystal Beach DMA Channel 4
-	6f25  Broadwell-DE Crystal Beach DMA Channel 5
-	6f26  Broadwell-DE Crystal Beach DMA Channel 6
-	6f27  Broadwell-DE Crystal Beach DMA Channel 7
-	6f28  Broadwell Adress Map/VTd_Misc/System Management
-	6f29  Broadwell IIO Hot Plug
-	6f2a  Broadwell IIO RAS/Control Status/Global Errors
-	6f2c  Broadwell I/O APIC
-	6f30  Broadwell Home Agent 0
-	6f32  Broadwell QPI Link 0
-	6f33  Broadwell QPI Link 1
-	6f34  Broadwell R2PCIe Agent
-	6f36  Broadwell R3 QPI Link 0/1
-	6f37  Broadwell R3 QPI Link 0/1
-	6f38  Broadwell Home Agent 1
-	6f39  Broadwell IO Performance Monitoring
-	6f3a  Broadwell QPI Link 2
-	6f3e  Broadwell R3 QPI Link 2
-	6f3f  Broadwell R3 QPI Link 2
-	6f40  Broadwell QPI Link 2
-	6f41  Broadwell R3 QPI Link 2
-	6f43  Broadwell QPI Link 2
-	6f45  Broadwell QPI Link 2 Debug
-	6f46  Broadwell QPI Link 2 Debug
-	6f47  Broadwell QPI Link 2 Debug
-	6f60  Broadwell Home Agent 1
-	6f68  Broadwell Target Address/Thermal/RAS
-	6f6a  Broadwell Channel Target Address Decoder
-	6f6b  Broadwell Channel Target Address Decoder
-	6f6c  Broadwell Channel Target Address Decoder
-	6f6d  Broadwell Channel Target Address Decoder
-	6f6e  Broadwell DDRIO Channel 2/3 Broadcast
-	6f6f  Broadwell DDRIO Global Broadcast
-	6f70  Broadwell Home Agent 0 Debug
-	6f71  Broadwell Memory Controller 0 - Target Address/Thermal/RAS
-	6f76  Broadwell R3 QPI Link Debug
-	6f78  Broadwell Home Agent 1 Debug
-	6f79  Broadwell Target Address/Thermal/RAS
-	6f7d  Broadwell Ubox
-	6f7e  Broadwell R3 QPI Link Debug
-	6f80  Broadwell QPI Link 0
-	6f81  Broadwell R3 QPI Link 0/1
-	6f83  Broadwell QPI Link 0
-	6f85  Broadwell QPI Link 0 Debug
-	6f86  Broadwell QPI Link 0 Debug
-	6f87  Broadwell QPI Link 0 Debug
-	6f88  Broadwell Power Control Unit
-	6f8a  Broadwell Power Control Unit
-	6f90  Broadwell QPI Link 1
-	6f93  Broadwell QPI Link 1
-	6f95  Broadwell QPI Link 1 Debug
-	6f96  Broadwell QPI Link 1 Debug
-	6f98  Broadwell Power Control Unit
-	6f99  Broadwell Power Control Unit
-	6f9a  Broadwell Power Control Unit
-	6f9c  Broadwell Power Control Unit
-	6fa0  Broadwell Home Agent 0
-	6fa8  Broadwell Memory Controller 0 - Target Address/Thermal/RAS
-	6faa  Broadwell Memory Controller 0 - Channel Target Address Decoder
-	6fab  Broadwell Memory Controller 0 - Channel Target Address Decoder
-	6fac  Broadwell Memory Controller 0 - Channel Target Address Decoder
-	6fad  Broadwell Memory Controller 0 - Channel Target Address Decoder
-	6fae  Broadwell DDRIO Channel 0/1 Broadcast
-	6faf  Broadwell DDRIO Global Broadcast
-	6fb0  Broadwell Memory Controller 0 - Channel 0 Thermal Control
-	6fb1  Broadwell Memory Controller 0 - Channel 1 Thermal Control
-	6fb2  Broadwell Memory Controller 0 - Channel 0 Error
-	6fb3  Broadwell Memory Controller 0 - Channel 1 Error
-	6fb4  Broadwell Memory Controller 0 - Channel 2 Thermal Control
-	6fb5  Broadwell Memory Controller 0 - Channel 3 Thermal Control
-	6fb6  Broadwell Memory Controller 0 - Channel 2 Error
-	6fb7  Broadwell Memory Controller 0 - Channel 3 Error
-	6fb8  Broadwell DDRIO Channel 2/3 Interface
-	6fb9  Broadwell DDRIO Channel 2/3 Interface
-	6fba  Broadwell DDRIO Channel 2/3 Interface
-	6fbb  Broadwell DDRIO Channel 2/3 Interface
-	6fbc  Broadwell DDRIO Channel 0/1 Interface
-	6fbd  Broadwell DDRIO Channel 0/1 Interface
-	6fbe  Broadwell DDRIO Channel 0/1 Interface
-	6fbf  Broadwell DDRIO Channel 0/1 Interface
-	6fc0  Broadwell Power Control Unit
-	6fc1  Broadwell Power Control Unit
-	6fc2  Broadwell Power Control Unit
-	6fc3  Broadwell Power Control Unit
-	6fc4  Broadwell Power Control Unit
-	6fc5  Broadwell Power Control Unit
-	6fc6  Broadwell Power Control Unit
-	6fc7  Broadwell Power Control Unit
-	6fc8  Broadwell Power Control Unit
-	6fc9  Broadwell Power Control Unit
-	6fca  Broadwell Power Control Unit
-	6fcb  Broadwell Power Control Unit
-	6fcc  Broadwell Power Control Unit
-	6fcd  Broadwell Power Control Unit
-	6fce  Broadwell Power Control Unit
-	6fcf  Broadwell Power Control Unit
-	6fd0  Broadwell Memory Controller 1 - Channel 0 Thermal Control
-	6fd1  Broadwell Memory Controller 1 - Channel 1 Thermal Control
-	6fd2  Broadwell Memory Controller 1 - Channel 0 Error
-	6fd3  Broadwell Memory Controller 1 - Channel 1 Error
-	6fd4  Broadwell Memory Controller 1 - Channel 2 Thermal Control
-	6fd5  Broadwell Memory Controller 1 - Channel 3 Thermal Control
-	6fd6  Broadwell Memory Controller 1 - Channel 2 Error
-	6fd7  Broadwell Memory Controller 1 - Channel 3 Error
-	6fe0  Broadwell Caching Agent
-	6fe1  Broadwell Caching Agent
-	6fe2  Broadwell Caching Agent
-	6fe3  Broadwell Caching Agent
-	6fe4  Broadwell Caching Agent
-	6fe5  Broadwell Caching Agent
-	6fe6  Broadwell Caching Agent
-	6fe7  Broadwell Caching Agent
-	6fe8  Broadwell Caching Agent
-	6fe9  Broadwell Caching Agent
-	6fea  Broadwell Caching Agent
-	6feb  Broadwell Caching Agent
-	6fec  Broadwell Caching Agent
-	6fed  Broadwell Caching Agent
-	6fee  Broadwell Caching Agent
-	6fef  Broadwell Caching Agent
-	6ff0  Broadwell Caching Agent
-	6ff1  Broadwell Caching Agent
-	6ff8  Broadwell Caching Agent
-	6ff9  Broadwell Caching Agent
-	6ffa  Broadwell Caching Agent
-	6ffb  Broadwell Caching Agent
-	6ffc  Broadwell Caching Agent
-	6ffd  Broadwell Caching Agent
-	6ffe  Broadwell Caching Agent
+	6f00  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DMI2
+	6f01  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 0
+	6f02  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 1
+	6f03  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 1
+	6f04  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 2
+	6f05  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 2
+	6f06  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 2
+	6f07  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 2
+	6f08  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 3
+	6f09  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 3
+	6f0a  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 3
+	6f0b  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 3
+	6f10  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f11  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f12  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f13  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f14  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f15  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f16  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f17  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f18  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f19  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f1a  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f1b  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f1c  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+	6f1d  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R2PCIe Agent
+	6f1e  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Ubox
+	6f1f  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Ubox
+	6f20  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 0
+	6f21  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 1
+	6f22  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 2
+	6f23  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 3
+	6f24  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 4
+	6f25  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 5
+	6f26  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 6
+	6f27  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 7
+	6f28  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Map/VTd_Misc/System Management
+	6f29  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Hot Plug
+	6f2a  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO RAS/Control Status/Global Errors
+	6f2c  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D I/O APIC
+	6f30  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 0
+	6f32  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0
+	6f33  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 1
+	6f34  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R2PCIe Agent
+	6f36  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 0/1
+	6f37  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 0/1
+	6f38  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 1
+	6f39  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IO Performance Monitoring
+	6f3a  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2
+	6f3e  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 2
+	6f3f  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 2
+	6f40  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2
+	6f41  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 2
+	6f43  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2
+	6f45  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2 Debug
+	6f46  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2 Debug
+	6f47  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2 Debug
+	6f50  Xeon Processor D Family QuickData Technology Register DMA Channel 0
+	6f51  Xeon Processor D Family QuickData Technology Register DMA Channel 1
+	6f52  Xeon Processor D Family QuickData Technology Register DMA Channel 2
+	6f53  Xeon Processor D Family QuickData Technology Register DMA Channel 3
+	6f60  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 1
+	6f68  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Target Address/Thermal/RAS
+	6f6a  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Channel Target Address Decoder
+	6f6b  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Channel Target Address Decoder
+	6f6c  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Channel Target Address Decoder
+	6f6d  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Channel Target Address Decoder
+	6f6e  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 2/3 Broadcast
+	6f6f  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Global Broadcast
+	6f70  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 0 Debug
+	6f71  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Target Address/Thermal/RAS
+	6f76  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link Debug
+	6f78  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 1 Debug
+	6f79  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Target Address/Thermal/RAS
+	6f7d  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Ubox
+	6f7e  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link Debug
+	6f80  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0
+	6f81  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 0/1
+	6f83  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0
+	6f85  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0 Debug
+	6f86  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0 Debug
+	6f87  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0 Debug
+	6f88  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6f8a  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6f90  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 1
+	6f93  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 1
+	6f95  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 1 Debug
+	6f96  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 1 Debug
+	6f98  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6f99  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6f9a  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6f9c  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fa0  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 0
+	6fa8  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Target Address/Thermal/RAS
+	6faa  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel Target Address Decoder
+	6fab  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel Target Address Decoder
+	6fac  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel Target Address Decoder
+	6fad  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel Target Address Decoder
+	6fae  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 0/1 Broadcast
+	6faf  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Global Broadcast
+	6fb0  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 0 Thermal Control
+	6fb1  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 1 Thermal Control
+	6fb2  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 0 Error
+	6fb3  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 1 Error
+	6fb4  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 2 Thermal Control
+	6fb5  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 3 Thermal Control
+	6fb6  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 2 Error
+	6fb7  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 3 Error
+	6fb8  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 2/3 Interface
+	6fb9  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 2/3 Interface
+	6fba  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 2/3 Interface
+	6fbb  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 2/3 Interface
+	6fbc  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 0/1 Interface
+	6fbd  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 0/1 Interface
+	6fbe  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 0/1 Interface
+	6fbf  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 0/1 Interface
+	6fc0  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fc1  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fc2  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fc3  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fc4  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fc5  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fc6  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fc7  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fc8  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fc9  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fca  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fcb  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fcc  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fcd  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fce  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fcf  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+	6fd0  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 0 Thermal Control
+	6fd1  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 1 Thermal Control
+	6fd2  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 0 Error
+	6fd3  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 1 Error
+	6fd4  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 2 Thermal Control
+	6fd5  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 3 Thermal Control
+	6fd6  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 2 Error
+	6fd7  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 3 Error
+	6fe0  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fe1  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fe2  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fe3  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fe4  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fe5  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fe6  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fe7  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fe8  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fe9  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fea  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6feb  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fec  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fed  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fee  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6fef  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6ff0  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6ff1  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6ff8  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6ff9  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6ffa  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6ffb  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6ffc  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6ffd  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+	6ffe  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
 	7000  82371SB PIIX3 ISA [Natoma/Triton II]
 		1af4 1100  Qemu virtual machine
 	7010  82371SB PIIX3 IDE [Natoma/Triton II]
@@ -25893,7 +26435,55 @@
 	a169  Sunrise Point-H PCI Root Port #19
 	a16a  Sunrise Point-H PCI Root Port #20
 	a170  Sunrise Point-H HD Audio
+	a182  Lewisburg SATA Controller [AHCI mode]
+	a190  Lewisburg PCI Express Root Port #1
+	a191  Lewisburg PCI Express Root Port #2
+	a192  Lewisburg PCI Express Root Port #3
+	a193  Lewisburg PCI Express Root Port #4
+	a194  Lewisburg PCI Express Root Port #5
+	a195  Lewisburg PCI Express Root Port #6
+	a196  Lewisburg PCI Express Root Port #7
+	a197  Lewisburg PCI Express Root Port #8
+	a198  Lewisburg PCI Express Root Port #9
+	a199  Lewisburg PCI Express Root Port #10
+	a19a  Lewisburg PCI Express Root Port #11
+	a19b  Lewisburg PCI Express Root Port #12
+	a19c  Lewisburg PCI Express Root Port #13
+	a19d  Lewisburg PCI Express Root Port #14
+	a19e  Lewisburg PCI Express Root Port #15
+	a19f  Lewisburg PCI Express Root Port #16
+	a1a0  Lewisburg P2SB
+	a1a1  Lewisburg PMC
+	a1a2  Lewisburg cAVS
+	a1a3  Lewisburg SMBus
+	a1a4  Lewisburg SPI Controller
+	a1af  Lewisburg USB 3.0 xHCI Controller
+	a1ba  Lewisburg CSME: HECI #1
+	a1bb  Lewisburg CSME: HECI #2
+	a1bc  Lewisburg CSME: IDE-r
+	a1bd  Lewisburg CSME: KT Controller
+	a1be  Lewisburg CSME: HECI #3
+	a1c1  Lewisburg LPC Controller
+	a1c2  Lewisburg LPC Controller
+	a1c3  Lewisburg LPC Controller
+	a1c4  Lewisburg LPC Controller
+	a1c5  Lewisburg LPC Controller
+	a1c6  Lewisburg LPC Controller
+	a1c7  Lewisburg LPC Controller
+	a1d2  Lewisburg SSATA Controller [AHCI mode]
+	a1e7  Lewisburg PCI Express Root Port #17
+	a1e8  Lewisburg PCI Express Root Port #18
+	a1e9  Lewisburg PCI Express Root Port #19
+	a1ea  Lewisburg PCI Express Root Port #20
+	a1f0  Lewisburg MROM 0
+	a1f1  Lewisburg MROM 1
+	a1f8  Lewisburg IE: HECI #1
+	a1f9  Lewisburg IE: HECI #2
+	a1fa  Lewisburg IE: IDE-r
+	a1fb  Lewisburg IE: KT Controller
+	a1fc  Lewisburg IE: HECI #3
 	a620  6400/6402 Advanced Memory Buffer (AMB)
+	abc0  Omni-Path Fabric Switch Silicon 100 Series
 	b152  21152 PCI-to-PCI Bridge
 		8086 b152  21152 PCI-to-PCI Bridge
 # observed, and documented in Intel revision note; new mask of 1011:0026
@@ -25956,8 +26546,8 @@
 	3860  AHA-2930CU
 	3b78  AHA-4844W/4844UW
 	5075  AIC-755x
-	5078  AIC-7850
-		9004 7850  AHA-2904/Integrated AIC-7850
+	5078  AIC-7850T/7856T [AVA-2902/4/6 / AHA-2910]
+		9004 7850  AIC-7850T/7856T [AVA-290x / AHA-2910]
 	5175  AIC-755x
 	5178  AIC-7851
 	5275  AIC-755x
@@ -26006,7 +26596,7 @@
 		9004 8020  ANA62022 2-port 64 bit 10/100
 		9004 8028  ANA69011A/TX 64 bit 10/100
 	7078  AHA-294x / AIC-7870
-	7178  AHA-2940/2940W / AIC-7871
+	7178  AIC-7870P/7871 [AHA-2940/W/S76]
 	7278  AHA-3940/3940W / AIC-7872
 	7378  AHA-3985 / AIC-7873
 	7478  AHA-2944/2944W / AIC-7874
@@ -26045,7 +26635,7 @@
 	7897  AIC-789x
 	8078  AIC-7880U
 		9004 7880  AIC-7880P Ultra/Ultra Wide SCSI Chipset
-	8178  AHA-2940U/UW/D / AIC-7881U
+	8178  AIC-7870P/7881U [AHA-2940U/UW/D/S76]
 		9004 7881  AHA-2940UW SCSI Host Adapter
 	8278  AHA-3940U/UW/UWD / AIC-7882U
 	8378  AHA-3940U/UW / AIC-7883U
@@ -26064,7 +26654,7 @@
 		9005 2180  AHA-2940U2 SCSI Controller
 		9005 8100  AHA-2940U2B SCSI Controller
 		9005 a100  AHA-2940U2B SCSI Controller
-		9005 a180  AHA-2940U2W SCSI Controller
+		9005 a180  AIC-3860Q [AHA-2940U2W/GE] SCSI Controller
 		9005 e100  AHA-2950U2B SCSI Controller
 	0011  AHA-2930U2
 	0013  78902
@@ -26437,7 +27027,10 @@ bdbd  Blackmagic Design
 	a12f  DeckLink Mini Monitor
 	a130  DeckLink Mini Recorder
 	a132  UltraStudio 4K
+	a136  DeckLink 4K Extreme 12G
+	a137  DeckLink Studio 4K
 	a138  Decklink SDI 4K
+	a139  Intensity Pro 4K
 c001  TSI Telsys
 c0a9  Micron/Crucial Technology
 c0de  Motorola
@@ -26513,6 +27106,7 @@ dada  Datapath Limited
 	1153  VisionDVI-DL
 	1154  VisionSDI2
 db10  Diablo Technologies
+dc93  Dawicontrol GmbH
 dcba  Dynamic Engineering
 	0046  PCIe Altera Cyclone IV
 # VPX format Receiver Controller Board
@@ -26546,7 +27140,11 @@ deaf  Middle Digital Inc.
 	9050  PC Weasel Virtual VGA
 	9051  PC Weasel Serial Port
 	9052  PC Weasel Watchdog Timer
-deda  SoftHard Technology Ltd.
+# formerly SoftHard Technology Ltd.
+deda  XIMEA
+	4001  Camera CB
+# Thunderbolt based camera MT family
+	4021  Camera MT
 e000  Winbond
 	e000  W89C940
 e159  Tiger Jet Network Inc.
@@ -26720,6 +27318,7 @@ C 02  Network controller
 	05  WorldFip controller
 	06  PICMG controller
 	07  Infiniband controller
+	08  Fabric controller
 	80  Network controller
 C 03  Display controller
 	00  VGA compatible controller
@@ -26873,4 +27472,5 @@ C 11  Signal processing controller
 C 12  Processing accelerators
 	00  Processing accelerators
 C 13  Non-Essential Instrumentation
+C 40  Coprocessor
 C ff  Unassigned class
diff --git a/usr/src/cmd/hwdata/usb.ids b/usr/src/cmd/hwdata/usb.ids
index 2fb82c4020..dbcfcffb3d 100644
--- a/usr/src/cmd/hwdata/usb.ids
+++ b/usr/src/cmd/hwdata/usb.ids
@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2015.03.17
-# Date:    2015-03-17 20:34:06
+# Version: 2015.09.28
+# Date:    2015-09-28 20:34:09
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -26,7 +26,7 @@
 0003  Club Mac
 0004  Nebraska Furniture Mart
 0011  Unknown
-	7788  Flash mass storage drive
+	7788  counterfeit flash drive
 0053  Planex
 	5301  GW-US54ZGL 802.11bg
 0079  DragonRise Inc.
@@ -176,6 +176,7 @@
 	011d  Bluetooth 1.2 Interface [Broadcom BCM2035]
 	0121  HP49g+ Calculator
 	0122  HID Internet Keyboard
+	0125  DAT72 Tape
 	0139  Barcode Scanner 4430
 	0201  ScanJet 6200c
 	0202  PhotoSmart S20
@@ -187,6 +188,7 @@
 	0212  DeskJet 1220C
 	0217  LaserJet 2200
 	0218  APOLLO P2500/2600
+	0221  StreamSmart 400 [F2235AA]
 	022a  Laserjet CP1525nw
 	0241  Link-5 micro dongle
 	0304  DeskJet 810c/812c
@@ -224,6 +226,7 @@
 	0701  ScanJet 5300c/5370c
 	0704  DeskJet 825c
 	0705  ScanJet 4400c
+	070c  Personal Media Drive
 	0711  OfficeJet K80
 	0712  DeskJet 1180c
 	0714  Printing Support
@@ -269,11 +272,13 @@
 	1116  Jornada 568 Pocket PC
 	1117  LaserJet 1300n
 	1151  PSC-750xi Printer/Scanner/Copier
+	1198  HID-compliant mouse
 	1202  PhotoSmart 320 series
 	1204  DeskJet 930c
 	1205  ScanJet 4500C/5550C
 	1211  OfficeJet v60xi
 	1217  LaserJet 2300L
+	1227  Virtual CD-ROM
 	1302  PhotoSmart 370 series
 	1305  ScanJet 4570c
 	1311  OfficeJet V30
@@ -459,7 +464,7 @@
 	3e17  LaserJet P1006
 	3f02  PhotoSmart 7550~
 	3f11  PSC-1315/PSC-1317
-	4002  PhotoSmart 635/715/720/735/935 (storage)
+	4002  PhotoSmart 635/715/720/735/935/E337 (storage)
 	4004  CP1160
 	4102  PhotoSmart 618
 	4105  ScanJet 4370
@@ -705,6 +710,7 @@
 	5635  M5635 Flash Card Reader
 	5636  USB 2.0 Storage Device
 	5637  M5637 IDE Controller
+	5642  Storage Device
 	5661  M5661 MP3 player
 	5667  M5667 MP3 player
 	9665  Gateway Webcam
@@ -714,7 +720,7 @@
 	1060  JTAG adapter
 	1234  IronLogic RFID Adapter [Z-2 USB]
 	1235  Iron Logic Z-397 RS-485/422 converter
-	6001  FT232 USB-Serial (UART) IC
+	6001  FT232 Serial (UART) IC
 	6002  Lumel PD12
 	6007  Serial Converter
 	6008  Serial Converter
@@ -800,6 +806,7 @@
 	d739  Propox ISPcable III
 	d9a9  Actisense USG-1 NMEA Serial Gateway
 	d9aa  Actisense NGT-1 NMEA2000 PC Interface
+	d9ab  Actisense NGT-1 NMEA2000 Gateway
 	daf4  Qundis Serial Infrared Head
 	e0d0  Total Phase Aardvark I2C/SPI Host Adapter
 	e521  EVER Sinline XL Series UPS
@@ -848,6 +855,7 @@
 	fc82  SEMC DSS-20/DSS-25 SyncStation
 	fd48  ShipModul MiniPlex-4xUSB NMEA Multiplexer
 	fd49  ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer
+	fd4b  ShipModul MiniPlex NMEA Multiplexer
 	ff08  ToolHouse LoopBack Adapter
 	ff18  ScienceScope Logbook ML
 	ff19  Logbook Bus
@@ -1064,6 +1072,7 @@
 	402b  Photo Printer 6850
 	402e  605 Photo Printer
 	4034  805 Photo Printer
+	404f  305 Photo Printer
 	4056  ESP 7200 Series AiO
 	4109  EasyShare Printer Dock Series 3
 	410d  EasyShare G600 Printer Dock
@@ -1074,6 +1083,8 @@
 	6003  i50
 	6004  i60
 	6005  i80
+	6029  i900
+	602a  i900
 040b  Weltrend Semiconductor
 	0a68  Func MS-3 gaming mouse [WT6573F MCU]
 	6510  Weltrend Bar Code Reader
@@ -1313,6 +1324,7 @@
 	4083  Live! Cam Socialize [VF0640]
 	4087  Live! Cam Socialize HD 1080 [VF0680]
 	4088  Live! Cam Chat HD [VF0700]
+	4095  Live! Cam Sync HD [VF0770]
 	4100  Nomad Jukebox 2
 	4101  Nomad Jukebox 3
 	4102  NOMAD MuVo^2
@@ -1412,8 +1424,11 @@
 	02e3  5230 (PC-Suite mode)
 	02e4  5230 (Imaging mode)
 	0360  C1-01 Ovi Suite Mode
+	0396  C7-00 (Modem mode)
 	03a4  C5 (Storage mode)
-	03c0  C7-00
+	03c0  C7-00 (Mass storage mode)
+	03c1  C7-00 (Media transfer mode)
+	03cd  C7-00 (Nokia Suite mode)
 	03d1  N950
 	0400  7600 Phone Parent
 	0401  6650 GSM Phone
@@ -1480,9 +1495,12 @@
 	0508  E65 (PC Suite mode)
 	0509  E65 (Storage mode)
 	0518  N9 Phone
+	054d  C2-01
 	0600  Digital Pen SU-1B
 	0610  CS-15 (Internet Stick 3G modem)
-	0661  Lumia 920
+	0661  Lumia 620/920
+	069a  130 [RM-1035] (Charging only)
+	0720  X (RM-980)
 	0800  Connectivity Cable DKU-5
 	0801  Data Cable DKU-6
 	0802  CA-42 Phone Parent
@@ -1507,6 +1525,7 @@
 	2020  USB Hub
 	20cd  Sitecom Internal Multi Memory reader/writer MD-005
 	20fc  6-in-1 Card Reader
+	2134  Hub
 	2228  9-in-2 Card Reader
 	223a  8-in-1 Card Reader
 	2503  USB 2.0 Hub
@@ -1523,6 +1542,7 @@
 	4060  Ultra Fast Media Reader
 	4064  Ultra Fast Media Reader
 	5434  Hub
+	5534  Hub
 	7500  LAN7500 Ethernet 10/100/1000 Adapter
 	9512  SMC9512/9514 USB Hub
 	9514  SMC9514 Hub
@@ -1855,9 +1875,10 @@
 	0006  Easy Mouse+
 	000b  NetMouse Wheel(P+U)
 	000c  TACOMA Fingerprint V1.06.01
-	000e  VideoCAM Web
+	000e  Genius NetScroll Optical
 	0013  TACOMA Fingerprint Mouse V1.06.01
 	001a  Genius WebScroll+
+	002e  NetScroll + Traveler / NetScroll 110
 	0036  Pocket Mouse LE
 	0039  NetScroll+ Superior
 	003a  NetScroll+ Mini Traveler / Genius NetScroll 120
@@ -2248,7 +2269,9 @@
 	0779  LifeCam HD-3000
 	0780  Comfort Curve Keyboard 3000
 	0797  Optical Mouse 200
+	07a5  Wireless Receiver 1461C
 	07f8  Wired Keyboard 600 (model 1576)
+	07fd  Nano Transceiver 1.1
 	930a  ISOUSB.SYS Intel 82930 Isochronous IO Test Board
 	ffca  Catalina
 	fff8  Keyboard
@@ -2258,7 +2281,7 @@
 	0006  LCD Tablet (12x9)
 	0008  Tablet (3x2.25)
 0461  Primax Electronics, Ltd
-	0010  HP Keyboard
+	0010  HP PR1101U / Primax PMX-KPR1101U Keyboard
 	0300  G2-300 Scanner
 	0301  G2E-300 Scanner
 	0302  G2-300 #2 Scanner
@@ -2377,6 +2400,7 @@
 	082b  Webcam C170
 	082d  HD Pro Webcam C920
 	0830  QuickClip
+	0836  B525 HD Webcam
 	0837  BCC950 ConferenceCam
 	0840  QuickCam Express
 	0843  Webcam C930e
@@ -2483,14 +2507,14 @@
 	0a29  H600 [Wireless Headset]
 	0a37  USB Headset H540
 	0a38  Headset H340
-	0a44  Wired headset
+	0a44  Headset H390
 	0a4d  G430 Surround Sound Gaming Headset
 	0b02  C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
 	8801  Video Camera
 	b305  BT Mini-Receiver
 	bfe4  Premium Optical Wheel Mouse
 	c000  N43 [Pilot Mouse]
-	c001  N48/M-BB48 [FirstMouse Plus]
+	c001  N48/M-BB48/M-UK96A [FirstMouse Plus]
 	c002  M-BA47 [MouseMan Plus]
 	c003  MouseMan
 	c004  WingMan Gaming Mouse
@@ -2556,6 +2580,7 @@
 	c06b  G700 Wireless Gaming Mouse
 	c06c  Optical Mouse
 	c077  M105 Optical Mouse
+	c07c  M-R0017 [G700s Rechargeable Gaming Mouse]
 	c101  UltraX Media Remote
 	c110  Harmony 785/885 Remote
 	c111  Harmony 525 Remote
@@ -2631,7 +2656,7 @@
 	c305  Internet Keyboard
 	c307  Internet Keyboard
 	c308  Internet Navigator Keyboard
-	c309  Internet Keyboard
+	c309  Y-BF37 [Internet Navigator Keyboard]
 	c30a  iTouch Composite
 	c30b  NetPlay Keyboard
 	c30c  Internet Keys (X)
@@ -2684,6 +2709,7 @@
 	c52d  R700 Remote Presenter receiver
 	c52e  MK260 Wireless Combo Receiver
 	c52f  Unifying Receiver
+	c531  C-U0007 [Unifying Receiver]
 	c532  Unifying Receiver
 	c534  Unifying Receiver
 	c603  3Dconnexion Spacemouse Plus XT
@@ -2973,8 +2999,9 @@
 	4254  BUA-100 Bluetooth Adapter
 	ac01  Savi 7xx
 	ad01  GameCom 777 5.1 Headset
+	c008  Audio 655 DSP
 	c00e  Blackwire C310 headset
-0480  Toshiba America Info. Systems, Inc.
+0480  Toshiba America Inc
 	0001  InTouch Module
 	0004  InTouch Module
 	0011  InTouch Module
@@ -2985,7 +3012,9 @@
 	a007  External Disk USB 3.0
 	a009  Stor.E Basics
 	a00d  STOR.E BASICS 500GB
+	a202  Canvio Basics HDD
 	b001  Stor.E Partner
+	d000  External Disk 2TB Model DT01ABA200
 	d010  External Disk 3TB
 	d011  Canvio Desk
 0481  Zenith Data Systems
@@ -3015,6 +3044,7 @@
 	3744  STLINK Pseudo disk
 	3747  ST Micro Connect Lite
 	3748  ST-LINK/V2
+	374b  ST-LINK/V2.1 (Nucleo-F103RB)
 	4810  ISDN adapter
 	481d  BT Digital Access adapter
 	5000  ST Micro/Ergenic ERG BT-002 Bluetooth Adapter
@@ -3022,9 +3052,11 @@
 	5710  Joystick in FS Mode
 	5720  STM microSD Flash Device
 	5721  Hantek DDS-3X25 Arbitrary Waveform Generator
+	5730  STM32 Audio Streaming
 	5740  STM32F407
 	7270  ST Micro Serial Bridge
 	7554  56k SoftModem
+	91d1  Sensor Hub
 	df11  STM Device in DFU Mode
 	ff10  Swann ST56 Modem
 0484  Specialix
@@ -3042,8 +3074,11 @@
 	e003  Pirelli DP-L10
 	e00d  Broadcom Bluetooth 2.1 Device
 	e00f  Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter]
+	e011  Acer Bluetooth module
 	e016  Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]
 	e02c  Atheros AR5BBU12 Bluetooth Device
+	e032  Broadcom BCM20702 Bluetooth
+	e042  Broadcom BCM20702 Bluetooth
 	e04d  Atheros AR3012 Bluetooth
 048a  S-MOS Systems, Inc.
 048c  Alps Electric Ireland, Ltd
@@ -3122,6 +3157,7 @@
 	1037  PSR-E403
 	103c  MOTIF-RACK ES
 	1054  S90XS Keyboard/Music Synthesizer
+	160f  P-105
 	2000  DGP-7
 	2001  DGP-5
 	3001  YST-MS55D USB Speaker
@@ -3422,11 +3458,14 @@
 	1728  MX310 ser
 	1729  MX700 ser
 	172b  MP140 ser
+	1736  PIXMA MX320 series
+	173a  MP250 series printer
 	173b  PIXMA MP270 All-In-One Printer
 	173e  MP560
 	173f  Pixma MP640 Multifunction device
 	1748  Pixma MG5150
 	174d  MX360 ser
+	176d  PIXMA MG2550
 	1900  CanoScan LiDE 90
 	1901  CanoScan 8800F
 	1904  CanoScan LiDE 100
@@ -3436,6 +3475,7 @@
 	1909  CanoScan LiDE 110
 	190a  CanoScan LiDE 210
 	190d  CanoScan 9000F Mark II
+	190e  CanoScan LiDE 120
 	2200  CanoScan LiDE 25
 	2201  CanoScan FB320U
 	2202  CanoScan FB620U
@@ -3709,6 +3749,7 @@
 	3160  Digital IXUS 860 IS
 	3170  SELPHY CP750
 	3171  SELPHY CP740
+	3172  SELPHY CP520
 	3173  PowerShot SD890 IS DIGITAL ELPH / Digital IXUS 970 IS / IXY DIGITAL 820 IS
 	3174  PowerShot SD790 IS DIGITAL ELPH / Digital IXUS 90 IS / IXY DIGITAL 95 IS
 	3175  IXY Digital 25 IS
@@ -3832,9 +3873,14 @@
 	3289  PowerShot ELPH 340 HS / IXUS 265 HS
 	328a  PowerShot ELPH 150 IS / IXUS 155
 	328b  PowerShot N Facebook(R) Ready
+	3299  EOS M3
 	329a  PowerShot SX60 HS
 	329b  PowerShot SX520 HS
 	329c  PowerShot SX400 IS
+	329f  PowerShot SX530 HS
+	32a6  PowerShot SX710 HS
+	32aa  Powershot ELPH 160 / IXUS 160
+	32ac  PowerShot ELPH 170 IS / IXUS 170
 04aa  DaeWoo Telecom, Ltd
 04ab  Chromatic Research
 04ac  Micro Audiometrics Corp.
@@ -4169,7 +4215,7 @@
 	0881  PX-404A [ME OFFICE 535]
 	0883  ME 340 Series/Stylus NX130 Series
 	0884  Stylus NX430W Series
-	0885  Stylus NX230 Series
+	0885  Stylus NX230/SX235W Series
 	088f  Stylus Office BX635FWD
 	0890  ME OFFICE 940FW Series/Stylus Office BX630FW Series
 	0891  Stylus Office BX535WD
@@ -4302,7 +4348,13 @@
 	004f  SK-9020 keyboard
 	1766  HID Monitor Controls
 	2004  Bluetooth 4.0 [Broadcom BCM20702A0]
+	2006  Broadcom BCM43142A0 Bluetooth Device
+	300b  Atheros AR3012 Bluetooth
+	300d  Atheros AR3012 Bluetooth
+	300f  Atheros AR3012 Bluetooth
+	3014  Qualcoom Atheros Bluetooth
 	7025  HP HD Webcam
+	7046  TOSHIBA Web Camera - HD
 	9304  Hub
 	f01c  TT1280DA DVB-T TV Tuner
 04cb  Fuji Photo Film Co., Ltd
@@ -4449,10 +4501,13 @@
 	8001  ICD2 in-circuit debugger
 	8101  PIC24F Starter Kit
 	8107  Microstick II
+	8108  ChipKit Pro MX7 (PIC32MX)
 	9004  Microchip REAL ICE
 	900a  PICkit3
 	c001  PicoLCD 20x4
 	e11c  TL866CS EEPROM Programmer [MiniPRO]
+	f2c4  Macareux-labs Hygrometry Temperature Sensor
+	f3aa  Macareux-labs Usbce Bootloader mode
 	f437  SBE Tech Ultrasonic Anemometer
 	f4b5  SmartScope
 	f8da  Hughski Ltd. ColorHug
@@ -4465,6 +4520,7 @@
 	fbbb  DiscFerret Magnetic Disc Analyser (active mode)
 	fc1e  Bachrus Speedometer Interface
 	fc92  Open Bench Logic Sniffer
+	ffee  Devantech USB-ISS
 	ffef  PICoPLC [APStech]
 04d9  Holtek Semiconductor, Inc.
 	0022  Portable Keyboard
@@ -4472,7 +4528,7 @@
 	0499  Optical Mouse
 	1203  Keyboard
 	1400  PS/2 keyboard + mouse controller
-	1503  Shortboard Lefty
+	1503  Keyboard
 	1603  Keyboard
 	1702  Keyboard LKS02
 	2011  Keyboard [Diatec Filco Majestouch 1]
@@ -4709,6 +4765,7 @@
 	3296  ML-2580N Mono Laser Printer
 	3297  ML-191x/ML-252x Laser Printer
 	329f  CLP-325 Color Laser Printer
+	3301  ML-1660 Series
 	330c  ML-1865
 	3310  ML-331x Series Laser Printer
 	3315  ML-2540 Series Laser Printer
@@ -4807,6 +4864,8 @@
 	60b3  M2 Portable Hard Drive
 	60c4  M2 Portable Hard Drive USB 3.0
 	6124  D3 Station External Hard Drive
+	6125  D3 Station External Hard Drive
+	61b5  M3 Portable Hard Drive 2TB
 	61b6  M3 Portable Hard Drive 1TB
 	6601  Mobile Phone
 	6602  Galaxy
@@ -4848,7 +4907,7 @@
 	685c  GT-I9250 Phone [Galaxy Nexus] (Mass storage mode)
 	685d  GT-I9100 Phone [Galaxy S II] (Download mode)
 	685e  GT-I9100 / GT-C3350 Phones (USB Debugging mode)
-	6860  GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1] , GT-I9500 [Galaxy S 4]
+	6860  Galaxy (MTP)
 	6863  GT-I9500 [Galaxy S4] / GT-I9250 [Galaxy Nexus] (network tethering)
 	6864  GT-I9070 (network tethering, USB debugging enabled)
 	6865  GT-I9300 Phone [Galaxy S III] (PTP mode)
@@ -4857,6 +4916,7 @@
 	6875  GT-B3710 Standalone LTE device (Commercial)
 	6876  GT-B3710 LTE Modem
 	6877  Galaxy S
+	687a  GT-E2370 mobile phone
 	6888  GT-B3730 Composite LTE device (Commercial)
 	6889  GT-B3730 Composite LTE device (Commercial)
 	689a  LTE Storage Driver [CMC2xx]
@@ -4908,6 +4968,7 @@
 	0760  Acer KU-0760 Keyboard
 	0841  HP Multimedia Keyboard
 	0860  2.4G Multimedia Wireless Kit
+	1061  HP KG-1061 Wireless Keyboard+Mouse
 	1121  Periboard 717 Mini Wireless Keyboard
 	a001  E-Video DC-100 Camera
 	a120  ORITE CCD Webcam(PC370R)
@@ -4918,6 +4979,7 @@
 	a128  PC Camera (SN9C202 + OV7663 + EEPROM)
 	a133  Gateway Webcam
 	a136  LabTec Webcam 5500
+	a147  Medion Webcam
 	a204  DSC WIA Device (1300)
 	a208  DSC WIA Device (2320)
 	a209  Labtec DC-2320
@@ -4974,6 +5036,9 @@
 	b330  Asus 720p CMOS webcam
 	b354  UVC 1.00 device HD UVC WebCam
 	b394  Integrated Camera
+	b3f6  HD WebCam (Acer)
+	b40e  HP Truevision HD camera
+	b444  Lenovo Integrated Webcam
 04f3  Elan Microelectronics Corp.
 	000a  Touchscreen
 	0103  ActiveJet K-2024 Multimedia Keyboard
@@ -4984,6 +5049,7 @@
 	0230  3D Optical Mouse
 	0232  Mouse
 	02f4  2.4G Cordless Mouse
+	0381  Touchscreen
 	04a0  Dream Cheeky Stress/Panic Button
 04f4  Harting Elektronik, Inc.
 04f5  Fujitsu-ICL Systems, Inc.
@@ -5043,16 +5109,17 @@
 	010b  MFC-860
 	010c  MFC-7400J
 	010d  MFC-9200J
-	010e  MFC3100C Scanner
-	010f  MFC 5100C
-	0110  MFC4800 Scanner
-	0111  MFC 6800
+	010e  MFC-3100C Scanner
+	010f  MFC-5100C
+	0110  MFC-4800 Scanner
+	0111  MFC-6800
 	0112  DCP1000 Port(FaxModem)
 	0113  MFC-8500
 	0114  MFC9700 Port(FaxModem)
-	0115  MFC9800 Scanner
+	0115  MFC-9800 Scanner
 	0116  DCP1400 Scanner
 	0119  MFC-9660
+	011a  MFC-9860
 	011b  MFC-9880
 	011c  MFC-9760
 	011d  MFC-9070
@@ -5061,13 +5128,20 @@
 	0120  MFC580 Port(FaxModem)
 	0121  MFC-590
 	0122  MFC-5100J
+	0124  MFC-4800J
+	0125  MFC-6800J
+	0127  MFC-9800J
+	0128  MFC-8500J
 	0129  Imagistics 2500 (MFC-8640D clone)
+	012b  MFC-9030
+	012e  FAX4100e IntelliFax 4100e
 	012f  FAX-4750e
+	0130  FAX-5750e
 	0132  MFC-5200C RemovableDisk
 	0135  MFC-100 Scanner
 	0136  MFC-150CL Scanner
 	013c  MFC-890 Port
-	013d  MFC-5200J Printer
+	013d  MFC-5200J
 	013e  MFC-4420C RemovableDisk
 	013f  MFC-4820C RemovableDisk
 	0140  DCP-8020
@@ -5077,14 +5151,17 @@
 	0144  DCP-4020C RemovableDisk
 	0146  MFC-3220C
 	0147  FAX-1820C Printer
-	0148  MFC-3320CN Printer
+	0148  MFC-3320CN
 	0149  FAX-1920CN Printer
 	014a  MFC-3420C
 	014b  MFC-3820CN
+	014c  DCP-3020C
 	014d  FAX-1815C Printer
 	014e  MFC-8820J
+	014f  DCP-8025J
 	0150  MFC-8220 Port(FaxModem)
 	0151  MFC-8210J
+	0153  DCP-1000J
 	0157  MFC-3420J Printer
 	0158  MFC-3820JN Port(FaxModem)
 	015d  MFC Composite Device
@@ -5110,7 +5187,7 @@
 	017b  Imagistics sx2100
 	0180  MFC-7420
 	0181  MFC-7820N Port(FaxModem)
-	0182  Composite Device
+	0182  DCP-7010
 	0183  DCP-7020
 	0184  DCP-7025 Printer
 	0185  MFC-7220 Printer
@@ -5144,31 +5221,44 @@
 	01ae  DCP-750CW RemovableDisk
 	01af  MFC-440CN
 	01b0  MFC-660CN
-	01b1  MFC-665CW Remote Setup Port
-	01b2  MFC-845CW Remote Setup Port
-	01b4  MFC-460CN Remote Setup Port
+	01b1  MFC-665CW
+	01b2  MFC-845CW
+	01b4  MFC-460CN
 	01b5  MFC-630CD
 	01b6  MFC-850CDN
-	01b7  MFC-5460CN Remote Setup Port
+	01b7  MFC-5460CN
 	01b8  MFC-5860CN
 	01ba  MFC-3360C
 	01bd  MFC-8660DN
 	01be  DCP-750CN RemovableDisk
-	01bf  MFC-860CDN Remote Setup Port
+	01bf  MFC-860CDN
 	01c0  DCP-128C
 	01c1  DCP-129C
 	01c2  DCP-131C
 	01c3  DCP-329C
 	01c4  DCP-331C
 	01c5  MFC-239C
-	01ca  MFC-9440CN Remote Setup Port
+	01c9  DCP-9040CN
+	01ca  MFC-9440CN
+	01cb  DCP-9045CDN
+	01cc  MFC-9840CDW
 	01ce  DCP-135C
 	01cf  DCP-150C
 	01d0  DCP-350C
 	01d1  DCP-560CN
+	01d2  DCP-770CW
+	01d3  DCP-770CN
 	01d4  MFC-230C
 	01d5  MFC-235C
 	01d6  MFC-260C
+	01d7  MFC-465CN
+	01d8  MFC-680CN
+	01d9  MFC-685CW
+	01da  MFC-885CW
+	01db  MFC-480CN
+	01dc  MFC-650CD
+	01dd  MFC-870CDN
+	01de  MFC-880CDN
 	01df  DCP-155C
 	01e0  MFC-265C
 	01e1  DCP-153C
@@ -5179,12 +5269,280 @@
 	01e9  DCP-7040
 	01ea  DCP-7030
 	01eb  MFC-7320
+	01ec  MFC-9640CW
 	01f4  MFC-5890CN
+	020a  MFC-8670DN
+	020c  DCP-9042CDN
+	020d  MFC-9450CDN
+	0216  MFC-8880DN
 	0217  MFC-8480DN
+	0219  MFC-8380DN
+	021a  MFC-8370DN
+	021b  DCP-8070D
+	021c  MFC-9320CW
+	021d  MFC-9120CN
+	021e  DCP-9010CN
+	0220  MFC-9010CN
+	0222  DCP-195C
 	0223  DCP-365CN
+	0224  DCP-375CW
+	0225  DCP-395CN
+	0227  DCP-595CN
+	0228  MFC-255CW
+	0229  MFC-295CN
+	022a  MFC-495CW
+	022b  MFC-495CN
+	022c  MFC-795CW
+	022d  MFC-675CD
+	022e  MFC-695CDN
+	022f  MFC-735CD
+	0230  MFC-935CDN
+	0234  DCP-373CW
+	0235  DCP-377CW
+	0236  DCP-390CN
+	0239  MFC-253CW
+	023a  MFC-257CW
+	023e  DCP-197C
+	023f  MFC-8680DN
+	0240  MFC-J950DN
 	0248  DCP-7055 scanner/printer
+	0253  DCP-J125
+	0254  DCP-J315W
+	0255  DCP-J515W
+	0256  DCP-J515N
+	0257  DCP-J715W
+	0258  DCP-J715N
+	0259  MFC-J220
+	025a  MFC-J410
+	025b  MFC-J265W
+	025c  MFC-J415W
+	025d  MFC-J615W
+	025e  MFC-J615N
+	025f  MFC-J700D
+	0260  MFC-J800D
+	0261  MFC-J850DN
+	026b  MFC-J630W
+	026d  MFC-J805D
+	026e  MFC-J855DN
+	026f  MFC-J270W
 	0273  DCP-7057 scanner/printer
-	02b3  MFC J4510DW
+	0276  MFC-5895CW
+	0278  MFC-J410W
+	0279  DCP-J525W
+	027a  DCP-J525N
+	027b  DCP-J725DW
+	027c  DCP-J725N
+	027d  DCP-J925DW
+	027e  MFC-J955DN
+	027f  MFC-J280W
+	0280  MFC-J435W
+	0281  MFC-J430W
+	0282  MFC-J625DW
+	0283  MFC-J825DW
+	0284  MFC-J825N
+	0285  MFC-J705D
+	0287  MFC-J860DN
+	0288  MFC-J5910DW
+	0289  MFC-J5910CDW
+	028a  DCP-J925N
+	028d  MFC-J835DW
+	028f  MFC-J425W
+	0290  MFC-J432W
+	0291  DCP-8110DN
+	0292  DCP-8150DN
+	0293  DCP-8155DN
+	0294  DCP-8250DN
+	0295  MFC-8510DN
+	0296  MFC-8520DN
+	0298  MFC-8910DW
+	0299  MFC-8950DW
+	029a  MFC-8690DW
+	029c  MFC-8515DN
+	029e  MFC-9125CN
+	029f  MFC-9325CW
+	02a0  DCP-J140W
+	02a5  MFC-7240
+	02a6  FAX-2940
+	02a7  FAX-2950
+	02a8  MFC-7290
+	02ab  FAX-2990
+	02ac  DCP-8110D
+	02ad  MFC-9130CW
+	02ae  MFC-9140CDN
+	02af  MFC-9330CDW
+	02b0  MFC-9340CDW
+	02b1  DCP-9020CDN
+	02b2  MFC-J810DN
+	02b3  MFC-J4510DW
+	02b4  MFC-J4710DW
+	02b5  DCP-8112DN
+	02b6  DCP-8152DN
+	02b7  DCP-8157DN
+	02b8  MFC-8512DN
+	02ba  MFC-8912DW
+	02bb  MFC-8952DW
+	02bc  DCP-J540N
+	02bd  DCP-J740N
+	02be  MFC-J710D
+	02bf  MFC-J840N
+	02c0  DCP-J940N
+	02c1  MFC-J960DN
+	02c2  DCP-J4110DW
+	02c3  MFC-J4310DW
+	02c4  MFC-J4410DW
+	02c5  MFC-J4610DW
+	02c6  DCP-J4210N
+	02c7  MFC-J4510N
+	02c8  MFC-J4910CDW
+	02c9  MFC-J4810DN
+	02ca  MFC-8712DW
+	02cb  MFC-8710DW
+	02cc  MFC-J2310
+	02cd  MFC-J2510
+	02ce  DCP-7055W
+	02cf  DCP-7057W
+	02d0  DCP-1510
+	02d1  MFC-1810
+	02d3  DCP-9020CDW
+	02d4  MFC-8810DW
+	02dd  DCP-J4215N
+	02de  DCP-J132W
+	02df  DCP-J152W
+	02e0  DCP-J152N
+	02e1  DCP-J172W
+	02e2  DCP-J552DW
+	02e3  DCP-J552N
+	02e4  DCP-J752DW
+	02e5  DCP-J752N
+	02e6  DCP-J952N
+	02e7  MFC-J245
+	02e8  MFC-J470DW
+	02e9  MFC-J475DW
+	02ea  MFC-J285DW
+	02eb  MFC-J650DW
+	02ec  MFC-J870DW
+	02ed  MFC-J870N
+	02ee  MFC-J720D
+	02ef  MFC-J820DN
+	02f0  MFC-J980DN
+	02f1  MFC-J890DN
+	02f2  MFC-J6520DW
+	02f3  MFC-J6570CDW
+	02f4  MFC-J6720DW
+	02f5  MFC-J6920DW
+	02f6  MFC-J6970CDW
+	02f7  MFC-J6975CDW
+	02f8  MFC-J6770CDW
+	02f9  DCP-J132N
+	02fa  MFC-J450DW
+	02fb  MFC-J875DW
+	02fc  DCP-J100
+	02fd  DCP-J105
+	02fe  MFC-J200
+	02ff  MFC-J3520
+	0300  MFC-J3720
+	030f  DCP-L8400CDN
+	0310  DCP-L8450CDW
+	0311  MFC-L8600CDW
+	0312  MFC-L8650CDW
+	0313  MFC-L8850CDW
+	0314  MFC-L9550CDW
+	0318  MFC-7365DN
+	0320  MFC-L2740DW
+	0321  DCP-L2500D
+	0322  DCP-L2520DW
+	0324  DCP-L2520D
+	0326  DCP-L2540DN
+	0328  DCP-L2540DW
+	0329  DCP-L2560DW
+	0330  HL-L2380DW
+	0331  MFC-L2700DW
+	0335  FAX-L2700DN
+	0337  MFC-L2720DW
+	0338  MFC-L2720DN
+	0339  DCP-J4120DW
+	033a  MFC-J4320DW
+	033c  MFC-J2320
+	033d  MFC-J4420DW
+	0340  MFC-J4620DW
+	0341  MFC-J2720
+	0342  MFC-J4625DW
+	0343  MFC-J5320DW
+	0346  MFC-J5620DW
+	0347  MFC-J5720DW
+	0349  DCP-J4220N
+	034b  MFC-J4720N
+	034e  MFC-J5720CDW
+	034f  MFC-J5820DN
+	0350  MFC-J5620CDW
+	0351  DCP-J137N
+	0353  DCP-J557N
+	0354  DCP-J757N
+	0355  DCP-J957N
+	0356  MFC-J877N
+	0357  MFC-J727D
+	0358  MFC-J987DN
+	0359  MFC-J827DN
+	035a  MFC-J897DN
+	035b  DCP-1610W
+	035c  DCP-1610NW
+	035d  MFC-1910W
+	035e  MFC-1910NW
+	0361  MFC-1919NW
+	0364  MFC-J5625DW
+	0365  MFC-J4520DW
+	0366  MFC-J5520DW
+	0367  DCP-7080D
+	0368  DCP-7080
+	0369  DCP-7180DN
+	036a  DCP-7189DW
+	036b  MFC-7380
+	036c  MFC-7480D
+	036d  MFC-7880DN
+	036e  MFC-7889DW
+	036f  DCP-9022CDW
+	0370  MFC-9142CDN
+	0371  MFC-9332CDW
+	0372  MFC-9342CDW
+	0373  MFC-L2700D
+	0376  DCP-1600
+	0377  MFC-1900
+	0378  DCP-1608
+	0379  DCP-1619
+	037a  MFC-1906
+	037b  MFC-1908
+	037c  ADS-2000e
+	037d  ADS-2100e
+	037e  ADS-2500We
+	037f  ADS-2600We
+	0380  DCP-J562DW
+	0381  DCP-J562N
+	0383  DCP-J962N
+	0384  MFC-J480DW
+	0385  MFC-J485DW
+	0386  MFC-J460DW
+	0388  MFC-J680DW
+	0389  MFC-J880DW
+	038a  MFC-J885DW
+	038b  MFC-J880N
+	038c  MFC-J730DN
+	038d  MFC-J990DN
+	038e  MFC-J830DN
+	038f  MFC-J900DN
+	0390  MFC-J5920DW
+	0392  MFC-L2705DW
+	0393  DCP-T300
+	0394  DCP-T500W
+	0395  DCP-T700W
+	0396  MFC-T800W
+	0397  DCP-J963N
+	03b3  MFC-J6925DW
+	03b4  MFC-J6573CDW
+	03b5  MFC-J6973CDW
+	03b6  MFC-J6990CDW
+	03bb  MFC-L2680W
+	03bc  MFC-L2700DN
+	03bd  DCP-J762N
 	1000  Printer
 	1002  Printer
 	2002  PTUSB Printing
@@ -5196,6 +5554,14 @@
 	2027  QL-560 P-Touch Label Printer
 	202b  PT-7600 P-Touch Label Printer
 	2100  Card Reader Writer
+	60a0  ADS-2000
+	60a1  ADS-2100
+	60a4  ADS-2500W
+	60a5  ADS-2600W
+	60a6  ADS-1000W
+	60a7  ADS-1100W
+	60a8  ADS-1500W
+	60a9  ADS-1600W
 04fa  Dallas Semiconductor
 	2490  DS1490F 2-in-1 Fob, 1-Wire adapter
 	4201  DS4201 Audio DAC
@@ -5453,7 +5819,7 @@
 	7569  Live! Pro (A)
 	756a  Live! Pro Audio (O)
 0529  Aladdin Knowledge Systems
-	0001  HASP v0.06
+	0001  HASP copy protection dongle
 	030b  eToken R1 v3.1.3.x
 	0313  eToken R1 v3.2.3.x
 	031b  eToken R1 v3.3.3.x
@@ -5764,6 +6130,7 @@
 	0005  InkJet Color Printer
 	000b  Workcentre 24
 	014e  CM215b Printer
+	0165  DocuPrint M215b
 0551  CompuTrend Systems, Inc.
 0552  Philips Monitors
 0553  STMicroelectronics Imaging Division (VLSI Vision)
@@ -5915,8 +6282,8 @@
 	0000  PenPartner
 	0001  PenPartner 4x5
 	0002  PenPartner 6x8
-	0003  Cintiq Partner
-	0010  Graphire
+	0003  PTU-600 [Cintiq Partner]
+	0010  ET-0405 [Graphire]
 	0011  Graphire 2 4x5
 	0012  Graphire 2 5x7
 	0013  Graphire 3 4x5
@@ -6161,6 +6528,7 @@
 	8402  Fritz!WLAN N 2.4 [Atheros AR9001U]
 	8403  Fritz!WLAN N v2 [Atheros AR9271]
 	84ff  AVM Fritz!WLAN USB N (in CD-ROM-mode)
+	8501  FRITZ WLAN N v2 [RT5572/rt2870.bin]
 057d  Shark Multimedia, Inc.
 057e  Nintendo Co., Ltd
 	0305  Broadcom BCM2045A Bluetooth Radio [Nintendo Wii]
@@ -6608,6 +6976,7 @@
 	0829  BigDisk Extreme+
 	100c  Rugged Triple Interface Mobile Hard Drive
 	1010  Desktop Hard Drive
+	1018  Desktop Hard Drive
 	1019  Desktop Hard Drive
 	1021  Little Disk
 	1027  iamaKey V2
@@ -6615,6 +6984,7 @@
 	1049  rikiki Harddrive
 	1052  P'9220 Mobile Drive
 	1064  Rugged 16 and 32 GB
+	106e  Porsche Design Desktop Drive
 	a601  HardDrive
 	a602  CD R/W
 05a0  Vetronix Corp.
@@ -6803,10 +7173,10 @@
 	12a4  iPad 3 (wifi)
 	12a5  iPad 3 (CDMA)
 	12a6  iPad 3 (3G, 16 GB)
-	12a8  iPhone5/5C/5S
+	12a8  iPhone5/5C/5S/6
 	12a9  iPad 2
 	12aa  iPod Touch 5.Gen [A1421]
-	12ab  iPad 4 (WiFi, 32GB)
+	12ab  iPad 4/Mini1
 	1300  iPod Shuffle
 	1301  iPod Shuffle 2.Gen
 	1302  iPod Shuffle 3.Gen
@@ -6909,6 +7279,7 @@
 	6000  Siemens SG75
 	6503  AnyData APE-540H
 	6613  Onda H600/N501HS ZTE MF330
+	6764  A0001 Phone [OnePlus One]
 	9000  SIMCom SIM5218 modem
 	9001  Gobi Wireless Modem
 	9002  Gobi Wireless Modem
@@ -7312,6 +7683,7 @@
 	0736  microSD Reader/Writer
 	0741  microSD Card Reader
 	0743  SDXC and microSDXC CardReader
+	0745  Logilink CR0012
 	0760  USB 2.0 Card Reader/Writer
 	0761  Genesys Mass Storage Device
 	0780  USBFS DFU Adapter
@@ -7563,6 +7935,7 @@
 064d  TriTech Microelectronics, Ltd
 064e  Suyin Corp.
 	2100  Sony Visual Communication Camera
+	9700  Asus Integrated Webcam
 	a100  Acer OrbiCam
 	a101  Acer CrystalEye Webcam
 	a102  Acer/Lenovo Webcam [CN0316]
@@ -8691,6 +9064,7 @@
 	1221  CardMan 1221
 	1784  CardMan 6020
 	3021  CardMan 3121
+	3022  CardMan 3021
 	3610  CardMan 3620
 	3621  CardMan 3621
 	3821  CardMan 3821
@@ -8770,6 +9144,7 @@
 	556d  Memory Vault
 	5571  Cruzer Fit
 	5576  Cruzer Facet
+	557d  Cruzer Force (64GB)
 	5580  SDCZ80 Flash Drive
 	5581  Ultra
 	5e10  Encrypted
@@ -9023,7 +9398,7 @@
 	0c0c  PL806 Scanner
 	0c26  OpticBook 4600 Scanner
 	0c2b  Mobile Office D428 Scanner
-	0e08  Plustek OpticBook A300 Scanner
+	0e08  OpticBook A300 Scanner
 	1300  OpticBook 3800 Scanner
 	1301  OpticBook 4800 Scanner
 07b4  Olympus Optical Co., Ltd
@@ -9745,6 +10120,8 @@
 	0013  USBee AX-Plus
 	0014  USBee AX-Pro
 	0015  USBee DX
+08ac  Macraigor Systems LLC
+	2024  usbWiggler
 08ae  Macally (Mace Group, Inc.)
 08b0  Metrohm
 	0006  814 Sample Processor
@@ -10039,6 +10416,8 @@
 0908  Siemens AG
 	01f4  SIMATIC NET CP 5711
 	01fe  SIMATIC NET PC Adapter A2
+	04b1  MediSET
+	04b2  NC interface
 	2701  ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA
 0909  Audio-Technica Corp.
 090a  Trumpion Microelectronics, Inc.
@@ -10177,6 +10556,7 @@
 	000c  Gigabeat F (mtp)
 	0010  Gigabeat S (mtp)
 	0200  Integrated Bluetooth (Taiyo Yuden)
+	021c  Atheros AR3012 Bluetooth
 	0301  PCX1100U Cable Modem (WDM)
 	0302  PCX2000 Cable Modem (WDM)
 	0305  Cable Modem PCX3000
@@ -10345,6 +10725,7 @@
 	1606  Eee PC 701 SD Card Reader [ENE UB6225]
 	1607  DataTraveler 100
 	160d  DataTraveler Vault Privacy
+	160e  DT110P/1GB Capless
 	1613  DataTraveler DT101C Flash Drive
 	1616  DataTraveler Locker 4GB
 	161a  Dell HyperVisor internal flash drive
@@ -10580,6 +10961,7 @@
 0a00  Liquid Audio
 0a01  ViA, Inc.
 0a05  Unknown Manufacturer
+	0001  Hub
 	7211  hub
 0a07  Ontrak Control Systems Inc.
 	0064  ADU100 Data Acquisition Interface
@@ -10773,6 +11155,8 @@
 	2150  BCM2046 Bluetooth Device
 	2151  Bluetooth
 	2154  BCM92046DG-CL1ROM Bluetooth 2.1 UHE Dongle
+	216c  BCM43142A0 Bluetooth Device
+	216f  BCM20702A0 Bluetooth
 	217d  HP Bluethunder
 	217f  BCM2045B (BDC-2.1)
 	2198  Bluetooth 3.0 Device
@@ -10798,6 +11182,7 @@
 	5801  BCM5880 Secure Applications Processor with fingerprint swipe sensor
 	5802  BCM5880 Secure Applications Processor with fingerprint touch sensor
 	5803  BCM5880 Secure Applications Processor with secure keyboard
+	5804  BCM5880 Secure Applications Processor with fingerprint swipe sensor
 	6300  Pirelli Remote NDIS Device
 	bd11  TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320]
 	bd13  BCM4323 802.11abgn Wireless Adapter
@@ -11130,6 +11515,7 @@
 	17ba  N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]
 	17c7  WL-330NUL
 	17c9  USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
+	17cb  Broadcom BCM20702A0 Bluetooth
 	17d1  AC51 802.11a/b/g/n/ac Wireless Adapter [Mediatek MT7610/Ralink RT2870]
 	4c80  Transformer Pad TF300TG
 	4c90  Transformer Pad Infinity TF700
@@ -11288,7 +11674,7 @@
 0b7b  Taiko Denki Co., Ltd
 0b7c  ITRAN Communications, Ltd
 0b7d  Astrodesign, Inc.
-0b81  id3 Semiconductors
+0b81  id3 Technologies
 	0001  Biothentic II smartcard reader with fingerprint sensor
 	0002  DFU-Enabled Devices (DFU)
 	0012  BioPAD biometric module (DFU + CDC)
@@ -11551,6 +11937,7 @@
 	0ca5  Android Phone [Evo Shift 4G]
 	0cae  T-Mobile MyTouch 4G Slide [Doubleshot]
 	0dea  M7_UL [HTC One]
+	0f25  One M8
 	0f64  Desire 601
 	0ff8  Desire HD (Tethering Mode)
 	0ff9  Desire / Desire HD / Hero / Thunderbolt (Charge Mode)
@@ -11666,6 +12053,7 @@
 	2831  RTL2831U DVB-T
 	2832  RTL2832U DVB-T
 	2838  RTL2838 DVB-T
+	5401  RTL 8153 USB 3.0 hub with gigabit ethernet
 	5730  HP 2.0MP High Definition Webcam
 	5775  HP "Truevision HD" laptop camera
 	8150  RTL8150 Fast Ethernet Adapter
@@ -12268,6 +12656,7 @@
 0cf2  ENE Technology, Inc.
 	6220  SD Card Reader (SG361)
 	6225  SD card reader (UB6225)
+	6230  SD Card Reader (UB623X)
 	6250  SD card reader (UB6250)
 0cf3  Atheros Communications, Inc.
 	0001  AR5523
@@ -12407,6 +12796,7 @@
 0d62  Darfon Electronics Corp.
 	0003  Smartcard Reader
 	0004  Keyboard
+	001b  Keyboard
 	001c  Benq X120 Internet Keyboard Pro
 	0306  M530 Mouse
 	0800  Magic Wheel
@@ -12494,6 +12884,7 @@
 	0107  CM108 Audio Controller
 	010f  CM108 Audio Controller
 	0115  CM108 Audio Controller
+	0139  Multimedia Headset [Gigaware by Ignition L.P.]
 	013c  CM108 Audio Controller
 	0201  CM6501
 	5000  Mass Storage Controller
@@ -12629,9 +13020,10 @@
 0db3  Tekram Technology Co., Ltd
 0db4  Chung Fu Chen Yeh Enterprise Corp.
 0db5  Access IS
-	0139  LSR116 CDC
-	013a  LSR116 Keyboard
-	013b  LSR116 HID
+	0139  Barcode Module - CDC serial
+	013a  Barcode Module - Virtual Keyboard
+	013b  Barcode Module - HID
+	0160  NFC and Smartcard Module (NSM)
 0db7  ELCON Systemtechnik
 	0002  Goldpfeil P-LAN
 0dba  Digidesign
@@ -12810,6 +13202,7 @@
 0e1b  Crewave
 0e20  Pegasus Technologies Ltd.
 	0101  NoteTaker
+	0200  Seiko Instruments InkLink Handwriting System
 0e21  Cowon Systems, Inc.
 	0300  iAudio CW200
 	0400  MP3 Player
@@ -13109,6 +13502,7 @@
 0f38  Nien-Yi Industrial Corp.
 0f39  TG3 Electronics
 	0876  Keyboard [87 Francium Pro]
+	1086  DK2108SZ Keyboard [Ducky Zero]
 0f3d  Airprime, Incorporated
 	0112  CDMA 1xEVDO PC Card, PC 5220
 0f41  RDC Semiconductor Co., Ltd
@@ -13225,12 +13619,14 @@
 	00d4  C902 [MTP]
 	00d9  C702 Phone
 	0112  W995 Walkman Phone
+	014e  J108i Cedar (MTP mode)
 	015a  Xperia Pro [Media Transfer Protocol]
 	0166  Xperia Mini Pro
 	0167  ST15i (Xperia mini)
 	0169  Xperia S
 	0172  Xperia P
 	0177  Xperia Ion [Mass Storage]
+	01bb  D5803 [Xperia Z3 Compact] (MTP mode)
 	0dde  Xperia Mini Pro Bootloader
 	1010  WMC Modem
 	10af  V640i Phone [PictBridge]
@@ -13239,6 +13635,7 @@
 	2137  Xperia X10 mini (USB debug)
 	2138  Xperia X10 mini pro (Debug)
 	2149  Xperia X8 (debug)
+	214e  J108i Cedar (Windows-driver mode)
 	3137  Xperia X10 mini
 	3138  Xperia X10 mini pro
 	3149  Xperia X8
@@ -13276,7 +13673,7 @@
 	d0e1  MD400 Mobile Broadband Modem
 	d12a  U100i Yari Phone
 	d12e  Xperia X10
-	d14e  J108i Cedar
+	d14e  J108i Cedar (modem mode)
 	e000  K810 (PictBridge mode)
 	e039  K800i (msc mode)
 	e042  W810i Phone
@@ -13295,6 +13692,7 @@
 	e112  W995 Phone (Mass Storage)
 	e12e  X10i Phone
 	e133  Vivaz
+	e14e  J108i Cedar (mass-storage mode)
 	e14f  Xperia Arc/X12
 	e15a  Xperia Pro [Mass Storage Class]
 	e161  Xperia Ray
@@ -13380,11 +13778,13 @@
 	61f9  Optimus (Various Models) MTP Mode
 	61fc  Optimus 3
 	61fe  Optimus Android Phone [USB tethering mode]
-	6300  Optimus Android Phone
+	6300  G2/Optimus Android Phone
 	631c  G2/Optimus Android Phone [MTP mode]
 	631d  Optimus Android Phone (Camera/PTP Mode)
 	631e  G2/Optimus Android Phone [Camera/PTP mode]
 	631f  Optimus Android Phone (Charge Mode)
+	633e  G2 Android Phone [MTP mode]
+	6344  G2 Android Phone [tethering mode]
 	6356  Optimus Android Phone [Virtual CD mode]
 	6800  CDMA Modem
 	7000  LG LDP-7024D(LD)USB
@@ -13674,6 +14074,7 @@
 1076  GCT Semiconductor, Inc.
 	0031  Bluetooth Device
 	0032  Bluetooth Device
+	8002  LU150 LTE Modem [Yota LU150]
 107b  Gateway, Inc.
 	3009  eHome Infrared Transceiver
 	55b2  WBU-110 802.11b Wireless Adapter [Intersil PRISM 3]
@@ -14074,6 +14475,28 @@
 	1003  IBSecureCam-P
 	1004  IBSecureCam-O
 	1005  IBSecureCam-N
+	1006  Mini IO-Board
+	2000  Zygmunt Krynicki Lantern Brightness Sensor
+	2048  Housedillon.com MRF49XA Transciever
+	2222  LabConnect Signalgenerator
+	2300  Keyboardio Keyboardio Model 01 Bootloader
+	2301  Keyboardio Keyboardio Model 01
+	2337  /Dev or SlashDev /Net
+	3000  lloyd3000
+	3333  LabConnect Digitalnetzteil
+	5222  telavivmakers attami
+	5a22  ikari_01 sd2snes
+	7bd0  pokey9000 Tiny Bit Dingus
+	abd0  tibounise ADB converter
+	beef  Modal MC-USB
+	c0f5  unethi PERswitch
+	ca1c  KnightOS Hub
+	ca1d  KnightOS MTP Device
+	cafe  ii iigadget
+	dada  Rebel Technology OWL
+	dead  chaosfield.at AVR-Ruler
+	fa11  moonglow OpenXHC
+	feed  ProgramGyar AVR-IR Sender
 120e  Hudson Soft Co., Ltd
 120f  Magellan
 	524e  RoadMate 1475T
@@ -14084,6 +14507,8 @@
 	001c  RP255 Guitar Multi-Effects Processor
 121e  Jungsoft Co., Ltd
 	3403  Muzio JM250 Audio Player
+1221  Unknown manufacturer
+	3234  Disk (Thumb drive)
 1223  SKYCABLE ENTERPRISE. CO., LTD.
 1228  Datapaq Limited
 	0012  Q18 Data Logger
@@ -14271,8 +14696,8 @@
 	140b  EC1260 Wireless Data Modem HSD USB Card
 	140c  E180v
 	1412  EC168c
-	1436  E173 3G Modem (modem-mode)
-	1446  E1552/E1800/E173 (HSPA modem)
+	1436  Broadband stick
+	1446  Broadband stick (modem on)
 	1465  K3765 HSPA
 	14c3  K5005 Vodafone LTE/UMTS/GSM Modem/Networkcard
 	14c8  K5005 Vodafone LTE/UMTS/GSM MOdem/Networkcard
@@ -14292,7 +14717,7 @@
 	1575  K5150 LTE modem
 	15ca  E3131 3G/UMTS/HSPA+ Modem (Mass Storage Mode)
 	1805  AT&T Go Phone U2800A phone
-	1c05  E173s 3G broadband stick (modem on)
+	1c05  Broadband stick (modem on)
 	1c0b  E173s 3G broadband stick (modem off)
 	1c20  R205 Mobile WiFi (Charging)
 	1d50  ET302s TD-SCDMA/TD-HSDPA Mobile Broadband
@@ -14578,6 +15003,7 @@
 	3375  Atheros AR3012 Bluetooth 4.0 Adapter
 	3392  Azurewave 43228+20702
 	3394  Bluetooth
+	3474  Atheros AR3012 Bluetooth
 	5070  Webcam
 	5111  Integrated Webcam
 	5115  Integrated Webcam
@@ -14894,11 +15320,31 @@
 	8400  INI DVS128
 	840d  INI DAViS
 	841a  INI DAViS FX3
-152b  FLYTECH Technology CO Ltd
-	0003  M.I.R. srl Minispir
+152b  MIR Srl
+	0001  spirobank II
+	0002  spirolab III
+	0003  MiniSpir
+	0004  Oxi
+	0005  spiros II
+	0006  smiths spirobank II
+	0007  smiths spirobank G-USB
+	0008  smiths MiniSpir
+	0009  spirobank G-USB
+	000a  smiths Oxi
+	000b  smiths spirolab III
+	000c  chorus III
+	000d  spirolab III Bw
+	000e  spirolab III
+	000f  easySpiro
+	0010  Spirotel converter
+	0011  spirobank
+	0012  spiro3 Zimmer
+	0013  spirotel serial
+	0014  spirotel II
+	0015  spirodoc
 152d  JMicron Technology Corp. / JMicron USA Technology Corp.
 	0539  JMS539/567 SuperSpeed SATA II/III 3.0G/6.0G Bridge
-	0567  JMS567 SATA 6.0Gb/s bridge
+	0567  JMS567 SATA 6Gb/s bridge
 	0770  Alienware Integrated Webcam
 	2329  JM20329 SATA Bridge
 	2335  ATA/ATAPI Bridge
@@ -14908,6 +15354,11 @@
 	2339  JM20339 SATA Bridge
 	2352  ATA/ATAPI Bridge
 	2509  JMS539 SuperSpeed SATA II 3.0G Bridge
+	2551  JMS551 SATA 3Gb/s bridge
+	2566  JMS566 SATA 3Gb/s bridge
+	2590  Seatay ATA/ATAPI Bridge
+	3562  JMS567 SATA 6Gb/s bridge
+	3569  JMS566 SATA 3Gb/s bridge
 152e  LG (HLDS)
 	2507  PL-2507 IDE Controller
 	e001  GSA-5120D DVD-RW
@@ -14932,6 +15383,7 @@
 	1181  Cinergy S2 PCIe Dual Port 1
 	1182  Cinergy S2 PCIe Dual Port 2
 1546  U-Blox AG
+	01a5  NL-402U
 1547  SG Intec Ltd & Co KG
 	1000  SG-Lock[U2]
 154a  Celectronic GmbH
@@ -14940,9 +15392,13 @@
 	0010  USB 2.0 Flash Drive
 	0048  Flash Drive
 	004d  8 GB Flash Drive
+	0053  Flash Drive
 	0057  32GB Micro Slide Attache Flash Drive
-	007a  8GB Classic Attache Flash Drive
+	005b  Flash Drive
+	0062  Flash Drive
+	007a  Classic Attache Flash Drive
 	6545  FD Device
+	fa05  Flash Drive
 154d  ConnectCounty Holdings Berhad
 154e  D&M Holdings, Inc. (Denon/Marantz)
 	3000  Marantz RC9001 Remote Control
@@ -15002,6 +15458,7 @@
 	0006  Wireless 11n USB Adapter
 	0010  802.11n USB Wireless Card
 	0012  WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870]
+	002d  WLTUBA-107 [Yota 4G LTE]
 15aa  Gearway Electronics (Dong Guan) Co., Ltd.
 15ad  VMware Inc.
 15ba  Olimex Ltd.
@@ -15182,6 +15639,8 @@
 	0404  WMA9109 UMTS Phone
 	0600  Vodafone VDA GPS / Toschiba Protege G710
 	0804  WP-S1 Phone
+1617  Sony Corp.
+	2002  NVX-P1 Personal Navigation System
 1619  L & K Precision Technology Co., Ltd.
 1621  Wionics Research
 1628  Stonestreet One, Inc.
@@ -15194,7 +15653,7 @@
 1631  Good Way Technology
 	6200  GWUSB2E
 	c019  RT2573
-1645  Cross Match Technologies GmbH
+1645  Entrega [hex]
 	0001  1S Serial Port
 	0002  2S Serial Port
 	0003  1S25 Serial Port
@@ -15233,6 +15692,8 @@
 165c  Kondo Kagaku
 	0002  Serial Adapter
 1660  Creatix Polymedia GmbH
+1667  GIGA-TMS INC.
+	0005  PCR330A RFID Reader (125 kHz, keyboard emulation)
 1668  Actiontec Electronics, Inc. [hex]
 	0009  Gateway
 	0333  Modem
@@ -15281,6 +15742,7 @@
 1687  Kingmax Digital Inc.
 	5289  FlashDisk
 	6211  FlashDisk
+	6213  FlashDisk
 1688  Saab AB
 1689  Razer USA, Ltd
 	fd00  Onza Tournament Edition controller
@@ -15373,6 +15835,8 @@
 	05e4  Free shared USB VID/PID pair for MIDI devices
 	06b4  USB2LPT with 2 interfaces
 	06b5  USB2LPT with 3 interfaces (native, HID, printer)
+	074e  DSP-Weuffen USB-HPI-Programmer
+	074f  DSP-Weuffen USB2-HPI-Programmer
 	0762  Osmocom SIMtrace
 	076b  OpenPCD 13.56MHz RFID Reader
 	076c  OpenPICC 13.56MHz RFID Simulator (native)
@@ -15446,6 +15910,7 @@
 	0011  MIDI-USB 1x1
 170d  Avnera
 1711  Leica Microsystems
+	0101  DFC-365FX camera
 	3020  IC80 HD Camera
 1724  Meyer Instruments (MIS)
 	0115  PAXcam5
@@ -15499,9 +15964,12 @@
 1748  MQP Electronics
 	0101  Packet-Master USB12
 174c  ASMedia Technology Inc.
-	5106  Transcend StoreJet 25M3
+	1153  ASM2115 SATA 6Gb/s bridge
+	2074  ASM1074 High-Speed hub
+	3074  ASM1074 SuperSpeed hub
+	5106  ASM1051 SATA 3Gb/s bridge
 	5136  ASM1053 SATA 6Gb/s bridge
-	55aa  ASM1051 SATA 3Gb/s bridge
+	55aa  ASM1051E SATA 6Gb/s bridge, ASM1053E SATA 6Gb/s bridge, ASM1153 SATA 3Gb/s bridge
 174f  Syntek
 	1105  SM-MS/Pro-MMC-XD Card Reader
 	110b  HP Webcam
@@ -15541,10 +16009,22 @@
 	083e  MetaGeek Wi-Spy
 	083f  MetaGeek Wi-Spy 2.4x
 	0938  Iguanaworks USB IR Transceiver
+	0a96  raphnet.net usb_game12
+	0a97  raphnet.net SNES mouse adapter
+	0a98  raphnet.net USBTenki
+	0a99  raphnet.net NES
+	0a9a  raphnet.net Gamecube/N64 controller
+	0a9b  raphnet.net DB9Joy
+	0a9c  raphnet.net Intellivision
+	0a9d  raphnet.net 4nes4snes
+	0a9e  raphnet.net Megadrive multitap
+	0a9f  raphnet.net MultiDB9joy
 	0c30  Telldus TellStick
 	0c31  Telldus TellStick Duo
 	0c9f  USBtiny
 	1eef  OpenAPC SecuKey
+	1ef0  E1701 Modular Controller Card
+	1ef1  E1701 Modular Controller Card
 1782  Spreadtrum Communications Inc.
 1784  TopSeed Technology Corp.
 	0001  eHome Infrared Transceiver
@@ -15892,6 +16372,10 @@
 1995  Trillium Technology Pty. Ltd.
 	3202  REC-ADPT-USB (recorder)
 	3203  REC-A-ADPT-USB (recorder)
+1996  PixeLINK
+	3010  Camera Release 4
+	3011  OEM Camera
+	3012  e-ImageData Corp. ScanPro
 199b  MicroStrain, Inc.
 	3065  3DM-GX3-25 Orientation Sensor
 199e  The Imaging Source Europe GmbH
@@ -16262,13 +16746,20 @@
 	1200  LE920
 1bce  Contac Cable Industrial Limited
 1bcf  Sunplus Innovation Technology Inc.
+	0005  Optical Mouse
 	0007  Optical Mouse
 	053a  Targa Silvercrest OMC807-C optische Funkmaus
 	05c5  SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver]
 	05cf  Micro keyboard & mouse receiver
 	0c31  SPIF30x Serial-ATA bridge
+	2880  Dell HD Webcam
 	2885  ASUS Webcam
 	2888  HP Universal Camera
+	28a2  Dell Integrated Webcam
+	28a6  DELL XPS Integrated Webcam
+	28ae  Laptop Integrated Webcam HD
+	28bd  Dell Integrated HD Webcam
+	2985  Laptop Integrated Webcam HD
 	2b83  Laptop Integrated Webcam FHD
 1bd0  Hangzhou Riyue Electronic Co., Ltd.
 1bd5  BG Systems, Inc.
@@ -16538,6 +17029,7 @@
 	0628  Data capturing and control module
 1f4d  G-Tek Electronics Group
 	b803  Lifeview LV5TDLX DVB-T [RTL2832U]
+	d220  Geniatech T220 DVB-T2 TV Stick
 1f6f  Aliph
 	0023  Jawbone Jambox
 	8000  Jawbone Jambox - Updating
@@ -16629,6 +17121,8 @@
 	f117  Formosa 3
 	f118  Formosa 4
 2002  DAP Technologies
+2003  detectomat
+	ea61  dc3500
 200c  Reloop
 	100b  Play audio soundcard
 2013  PCTV Systems
@@ -16661,6 +17155,8 @@
 	ed16  GW-USMicroN2W 802.11bgn Wireless Adapter [Realtek RTL8188SU]
 	ed17  GW-USValue-EZ 802.11n Wireless Adapter [Realtek RTL8188CUS]
 	ed18  GW-USHyper300 / GW-USH300N 802.11bgn Wireless Adapter [Realtek RTL8191SU]
+203d  Encore Electronics Inc.
+	1480  ENUWI-N3 [802.11n Wireless N150 Adapter]
 2040  Hauppauge
 	0c80  Windham
 	0c90  Windham
@@ -16706,11 +17202,16 @@
 	0200  MSP430 USB HID Bootstrap Loader
 	0855  Invensense Embedded MotionApp HID Sensor
 	0964  Inventio Software MSP430
+2058  Nano River Technology
+	2058  ViperBoard I2C, SPI, GPIO interface
+2077  Taicang T&W Electronics Co. Ltd
+	9002  W1M100 HSPA/WCDMA Module
 2080  Barnes & Noble
 	0001  nook
 	0002  NOOKcolor
 	0003  NOOK Simple Touch
 	0004  NOOK Tablet
+2086  SIMPASS
 2087  Cando
 	0a01  Multi Touch Panel
 	0a02  Multi Touch Panel
@@ -16733,12 +17234,43 @@
 	1db6  IDBG in normal mode
 	c25b  C2 Dongle
 	cb72  ben-wpan, cntr
+20ce  Minicircuits
+	0012  RF Sythesizer 250-4200MHz model SSG-4000LH
+	0021  RF Switch Matrix
+	0022  I/O Controller
 20df  Simtec Electronics
 	0001  Entropy Key [UDEKEY01]
+20f1  NET New Electronic Technology GmbH
+	0101  iCube3 Camera
 20f4  TRENDnet
 	648b  TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]
+20f7  XIMEA
+	3001  Camera with CMOS sensor [MQ]
+	3021  Camera with CCD sensor [MD]
+	30b3  Camera with CMOS sensor in Vision mode [MQ]
+	a003  Subminiature 5Mpix B/W Camera, MU9PM-MH
+2100  RT Systems
+	9e52  Yaesu VX-7
+	9e54  CT29B Radio Cable
+	9e57  RTS01 Radio Cable
+	9e5d  K4Y Radio Cable
+	9e5f  FT232RL [RTS05 Serial Cable]
 2101  ActionStar
 	0201  SIIG 4-to-2 Printer Switch
+2109  VIA Labs, Inc.
+	0700  VL700 SATA 3Gb/s bridge
+	0701  VL701 SATA 3Gb/s bridge
+	0810  VL81x Hub
+	0811  Hub
+	0812  VL812 Hub
+	2811  Hub
+	2812  VL812 Hub
+	3431  Hub
+	8110  Hub
+2113  Softkinetic
+	0137  DepthSense 311 (3D)
+	0145  DepthSense 325
+	8000  DepthSense 311 (Color)
 2149  Advanced Silicon S.A.
 	211b  Touchscreen Controller
 	2703  TS58xxA/TC56xxA [CoolTouch]
@@ -16769,6 +17301,15 @@
 	6323  USB Electronic Scale
 2237  Kobo Inc.
 	4161  eReader White
+225d  Morpho
+	0001  FINGER VP Multimodal Biometric Sensor
+	0008  CBM-E3 Fingerprint Sensor
+	0009  CBM Fingerprint Sensor [CBM-V3]
+	000a  MSO1300-E3 Fingerprint Sensor
+	000b  MSO1300 Fingerprint Sensor [MSO1300-V3]
+	000c  MSO1350-E3 Fingerprint Sensor & SmartCard Reader
+	000d  MSO1350 Fingerprint Sensor & SmartCard Reader [MSO1350-V3]
+	000e  MorphoAccess SIGMA Biometric Access Control Terminal
 228d  8D Technologies inc.
 	0001  Terminal Bike Key Reader
 22a6  Pie Digital, Inc.
@@ -16933,6 +17474,9 @@
 2478  Tripp-Lite
 	2008  U209-000-R Serial Port
 249c  M2Tech s.r.l.
+24e1  Paratronic
+	3001  Adp-usb
+	3005  Radius
 2632  TwinMOS
 	3209  7-in-1 Card Reader
 2639  Xsens
@@ -17023,6 +17567,22 @@
 	3300  WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3]
 2899  Toptronic Industrial Co., Ltd
 	012c  Camera Device
+289b  Dracal/Raphnet technologies
+	0001  Gamecube/N64 controller v2.2
+	0002  2nes2snes
+	0003  4nes4snes
+	0004  Gamecube/N64 controller v2.3
+	0005  Saturn (Joystick mode)
+	0006  Saturn (Mouse mode)
+	0007  Famicom controller
+	0008  Dreamcast (Joystick mode)
+	0009  Dreamcast (Mouse mode)
+	000a  Dreamcast (Keyboard mode)
+	000b  Gamecube/N64 controller v2.9 (Keyboard mode)
+	000c  Gamecube/N64 controller v2.9 (Joystick mode)
+	0100  Dual-relay board
+	0500  Energy meter
+	0502  Precision barometer
 2931  Jolla Oy
 	0a01  Jolla Phone MTP
 	0a02  Jolla Phone Developer
@@ -17039,7 +17599,7 @@
 	003c  Arduino Explora (bootloader)
 	003d  Arduino Due (usb2serial)
 	003e  Arduino Due
-	0041  Arduino Yùn (bootloader)
+	0041  Arduino Yun (bootloader)
 	0042  Arduino Mega 2560 Rev3
 	0043  Arduino Uno Rev3
 	004d  Arduino Zero Pro (bootloader)
@@ -17050,8 +17610,19 @@
 	8039  Arduino Robot Motor (CDC ACM)
 	803a  Arduino Micro ADK rev3 (CDC ACM)
 	803c  Arduino Explora (CDC ACM)
-	8041  Arduino Yùn (CDC ACM)
+	8041  Arduino Yun (CDC ACM)
 	804d  Arduino Zero Pro (CDC ACM)
+2a37  RTD Embedded Technologies, Inc.
+	5110  UPS35110/UPS25110
+2a45  Meizu Corp.
+	0001  MX Phone (BICR)
+	0c02  MX Phone (MTP & ADB)
+	0c03  MX Phone (BICR & ADB)
+	2008  MX Phone (MTP)
+	200a  MX Phone (MTP & ACM & ADB)
+	200b  MX Phone (PTP)
+	200c  MX Phone (PTP & ADB)
+	2012  MX Phone (MTP & ACM)
 2c02  Planex Communications
 	14ea  GW-US11H WLAN
 2c1a  Dolphin Peripherals
@@ -17087,6 +17658,8 @@
 	0054  Flash Drive (2GB)
 3579  DIVA
 	6901  Media Reader
+357d  Sharkoon
+	7788  QuickPort XT
 3636  InVibro
 3838  WEM
 	0001  5-in-1 Card Reader
@@ -17351,6 +17924,8 @@
 	b200  Compact Flash Reader
 	b204  MMC/ SD Reader
 	b207  Memory Stick Reader
+5654  Gotview
+	ca42  MasterHD 3
 5656  Uni-Trend Group Limited
 	0832  UT2000/UT3000 Digital Storage Oscilloscope
 595a  IRTOUCHSYSTEMS Co. Ltd.
@@ -17444,6 +18019,8 @@
 734c  TBS Technologies China
 	5920  Q-Box II DVB-S2 HD
 	5928  Q-Box II DVB-S2 HD
+7373  Beijing STONE Technology Co. Ltd.
+	5740  Intelligent TFT-LCD Module
 7392  Edimax Technology Co., Ltd
 	7711  EW-7711UTn nLite Wireless Adapter [Ralink RT2870]
 	7717  EW-7717UN 802.11n Wireless Adapter [Ralink RT2870]
@@ -17506,7 +18083,6 @@
 	2000  Flashdisk
 8564  Transcend Information, Inc.
 	1000  JetFlash
-		8564 1000  JetFlash
 	4000  RDF8
 8644  Intenso GmbG
 	8003  Micro Line
@@ -17541,6 +18117,8 @@
 	8988  V.cap Camera Device
 9ac4  J. Westhues
 	4b8f  ProxMark-3 RFID Instrument
+9e88  Marvell Semiconductor, Inc.
+	9e8f  Plug Computer Basic [SheevaPlug]
 a128  AnMo Electronics Corp. / Dino-Lite (?)
 	0610  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
 	0611  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
diff --git a/usr/src/cmd/localedef/Makefile b/usr/src/cmd/localedef/Makefile
index 45cc1c88c0..03432dbcf8 100644
--- a/usr/src/cmd/localedef/Makefile
+++ b/usr/src/cmd/localedef/Makefile
@@ -202,7 +202,8 @@ UTF_8_LOCALES		= \
 		ug_CN \
 		ur_IN ur_PK \
 		vi_VN \
-		zh_CN zh_HK zh_MO zh_SG zh_TW
+		zh_CN zh_HK zh_MO zh_SG zh_TW \
+		zz_AA
 
 UTF8SRCS	= $(UTF_8_LOCALES:%=data/%.UTF-8.src)
 
@@ -245,11 +246,32 @@ ROOTLOCDIRS	= $(LOCDIRS:%=$(ROOTLIB)/%)
 ROOTCATDIRS	= $(CATDIRS:%=$(ROOTLIB)/%)
 ROOTDATA	= $(DATA:%=$(ROOTLIB)/%)
 
+#
+# This is a list of locales that happen to have translations for them
+# present in the gate.
+#
+TRANSDIR	= translations
+TRANSLOCS	= \
+		zz_AA.UTF-8
+TRANSMOS	= $(TRANSLOCS:%=$(TRANSDIR)/%.mo)
+
+OSTMOFILE	= LC_MESSAGES/SUNW_OST_OSLIB.mo
+
+PRIVTRANSLOCS	= \
+		zz_AA.UTF-8
+PRIVFILE	= LC_MESSAGES/priv_names
+		
+
+ROOTTRANSLATIONS = $(TRANSLOCS:%=$(ROOTLIB)/locale/%/$(OSTMOFILE))
+ROOTPRIVTRANS = $(PRIVTRANSLOCS:%=$(ROOTLIB)/locale/%/$(PRIVFILE))
+
 $(ROOTDATA)	:= FILEMODE=0444
 
 all: $(PROG) $(DATA)
 
-install: all $(ROOTPROG) $(ROOTDATA)
+translate: $(ROOTTRANSLATIONS) $(ROOTPRIVTRANS)
+
+install: all $(ROOTPROG) $(ROOTDATA) $(ROOTTRANSLATIONS) $(ROOTPRIVTRANS)
 
 $(NDIR):
 	mkdir $@
@@ -282,6 +304,7 @@ clobber: clean
 	$(RM) $(CLOBBERFILES)
 	$(RM) -r $(LOCDIRS)
 	$(RM) -r $(NDIR)
+	$(RM) $(TRANSMOS)
 
 $(POFILE):	$(PIFILES)
 	$(RM) $@
@@ -364,3 +387,14 @@ $(ROOTDATA):	$(ROOTLOCDIRS) $(ROOTCATDIRS) $(DATA)
 	$(RM) $@
 	$(CP) $(@:$(ROOTLIB)/%=%) $@
 	$(CHMOD) 0444 $@
+
+%.mo: %.po
+	$(MSGFMT) -o $@ $<
+
+$(ROOTLIB)/locale/%/$(OSTMOFILE): $(TRANSDIR)/%.mo
+	$(INS.rename)
+	$(CHMOD) 0444 $@
+
+$(ROOTLIB)/locale/%/$(PRIVFILE): $(TRANSDIR)/%.priv
+	$(INS.rename)
+	$(CHMOD) 0444 $@
diff --git a/usr/src/cmd/localedef/data/zz_AA.UTF-8.src b/usr/src/cmd/localedef/data/zz_AA.UTF-8.src
new file mode 120000
index 0000000000..8a3463821d
--- /dev/null
+++ b/usr/src/cmd/localedef/data/zz_AA.UTF-8.src
@@ -0,0 +1 @@
+en_US.UTF-8.src
+\ No newline at end of file
diff --git a/usr/src/cmd/localedef/translations/zz_AA.UTF-8.po b/usr/src/cmd/localedef/translations/zz_AA.UTF-8.po
new file mode 100644
index 0000000000..e1c551233f
--- /dev/null
+++ b/usr/src/cmd/localedef/translations/zz_AA.UTF-8.po
@@ -0,0 +1,7 @@
+#
+# The zz_AA locale is purely a test locale. These translations are
+# currently used for the strerror tests, to verify that strerror_l and
+# the various locale aware aspects of it are working correctly.
+#
+msgid "No such file or directory"
+msgstr "It's a trap!"
diff --git a/usr/src/cmd/localedef/translations/zz_AA.UTF-8.priv b/usr/src/cmd/localedef/translations/zz_AA.UTF-8.priv
new file mode 100644
index 0000000000..ad14a98a70
--- /dev/null
+++ b/usr/src/cmd/localedef/translations/zz_AA.UTF-8.priv
@@ -0,0 +1,25 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2015 Joyent, Inc.
+#
+
+#
+#
+# This is a dummy version of the privilege names file. It is designed to
+# be used to test priv_gettext which does not use a normal message file.
+# See lib/libc/port/gen/priv_str_xlate.c for how this file is supposed
+# to be formatted.
+#
+
+dtrace_kernel
+	Ah Elbereth Gilthoniel
diff --git a/usr/src/cmd/sgs/rtld/common/external.c b/usr/src/cmd/sgs/rtld/common/external.c
index e2ebd89145..4a16ffcf9b 100644
--- a/usr/src/cmd/sgs/rtld/common/external.c
+++ b/usr/src/cmd/sgs/rtld/common/external.c
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ * Copyright 2015 Joyent, Inc.
  */
 
 /*
@@ -180,6 +181,7 @@
 #include <synch.h>
 #include <strings.h>
 #include <stdio.h>
+#include <libintl.h>
 #include <debug.h>
 #include <libc_int.h>
 #include "_elf.h"
@@ -718,3 +720,24 @@ isalnum(int c)
 {
 	return ((isalpha(c) || isdigit(c)) ? 1 : 0);
 }
+
+/*
+ * In a similar vein to the is* functions above, we also have to define our own
+ * version of strerror, as it is implemented in terms of the locale aware
+ * strerror_l, and we'd rather not have the full set of libc symbols used here.
+ */
+extern const char _sys_errs[];
+extern const int _sys_index[];
+extern int _sys_num_err;
+
+char *
+strerror(int errnum)
+{
+	if (errnum < _sys_num_err && errnum >= 0) {
+		return (dgettext("SUNW_OST_OSLIB",
+		    (char *)&_sys_errs[_sys_index[errnum]]));
+	}
+
+	errno = EINVAL;
+	return (dgettext("SUNW_OST_OSLIB", "Unknown error"));
+}
diff --git a/usr/src/head/string.h b/usr/src/head/string.h
index 6801c7eb9d..30dc025467 100644
--- a/usr/src/head/string.h
+++ b/usr/src/head/string.h
@@ -103,6 +103,7 @@ extern size_t strxfrm_l(char *_RESTRICT_KYWD, const char *_RESTRICT_KYWD,
     size_t, locale_t);
 extern int strcasecmp_l(const char *, const char *, locale_t);
 extern int strncasecmp_l(const char *, const char *, size_t, locale_t);
+extern char *strerror_l(int, locale_t);
 
 #endif /* defined(_STRICT_SYMBOLS) || defined(_XPG7) */
 
diff --git a/usr/src/lib/libc/inc/libc.h b/usr/src/lib/libc/inc/libc.h
index 5feca8b80f..86d894b3de 100644
--- a/usr/src/lib/libc/inc/libc.h
+++ b/usr/src/lib/libc/inc/libc.h
@@ -311,6 +311,11 @@ extern wint_t _putwc(wint_t, FILE *);
  */
 extern wint_t	__ungetwc_xpg5(wint_t, FILE *);
 
+/*
+ * Defined in setlocale.c.
+ */
+extern char *current_locale(locale_t, int);
+
 #ifdef	__cplusplus
 }
 #endif
diff --git a/usr/src/lib/libc/port/gen/_libc_gettext.h b/usr/src/lib/libc/port/gen/_libc_gettext.h
index b73bc6e95c..868d85a2b8 100644
--- a/usr/src/lib/libc/port/gen/_libc_gettext.h
+++ b/usr/src/lib/libc/port/gen/_libc_gettext.h
@@ -27,15 +27,17 @@
 #ifndef	_LIBC_GETTEXT_H
 #define	_LIBC_GETTEXT_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <libintl.h>
+#include <locale.h>
+
+extern char *dgettext_l(const char *, const char *, locale_t);
 
 /* Header file for _libc_gettext() macro. */
 #if !defined(TEXT_DOMAIN)	/* Should be defined thru -D flag. */
 #define	TEXT_DOMAIN	"SYS_TEST"
 #endif
 
-#define	_libc_gettext(msg_id)	dgettext(TEXT_DOMAIN, msg_id)
+#define	_libc_gettext(msg_id)		dgettext(TEXT_DOMAIN, (msg_id))
+#define	_libc_gettext_l(msg_id, loc)	dgettext_l(TEXT_DOMAIN, (msg_id), (loc))
 
 #endif	/* _LIBC_GETTEXT_H */
diff --git a/usr/src/lib/libc/port/gen/catopen.c b/usr/src/lib/libc/port/gen/catopen.c
index 0da2a749fa..8a0ca43a3c 100644
--- a/usr/src/lib/libc/port/gen/catopen.c
+++ b/usr/src/lib/libc/port/gen/catopen.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * catopen.c
  *
@@ -103,10 +101,12 @@ process_nls_path(char *name, int oflag)
 	 *
 	 * Chose XPG4. If oflag == NL_CAT_LOCALE, use LC_MESSAGES.
 	 */
-	if (oflag == NL_CAT_LOCALE)
-		locale = setlocale(LC_MESSAGES, NULL);
-	else
+	if (oflag == NL_CAT_LOCALE) {
+		locale_t loc = uselocale(NULL);
+		locale = current_locale(loc, LC_MESSAGES);
+	} else {
 		locale = getenv("LANG");
+	}
 
 	nlspath = getenv("NLSPATH");
 	lang = NULL;
diff --git a/usr/src/lib/libc/port/gen/gettxt.c b/usr/src/lib/libc/port/gen/gettxt.c
index 88e0b5b72c..a462c5ba1e 100644
--- a/usr/src/lib/libc/port/gen/gettxt.c
+++ b/usr/src/lib/libc/port/gen/gettxt.c
@@ -27,8 +27,6 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #pragma weak _gettxt = gettxt
 
 #include "lint.h"
@@ -91,6 +89,7 @@ gettxt(const char *msg_id, const char *dflt_str)
 	char	*tokp;
 	size_t	name_len;
 	char	*curloc;
+	locale_t	loc;
 
 	if ((msg_id == NULL) || (*msg_id == '\0')) {
 		return (handle_return(dflt_str));
@@ -121,7 +120,8 @@ gettxt(const char *msg_id, const char *dflt_str)
 			return (handle_return(dflt_str));
 	}
 	msgnum = atoi(msg_id + name_len + 1);
-	curloc = setlocale(LC_MESSAGES, NULL);
+	loc = uselocale(NULL);
+	curloc = current_locale(loc, LC_MESSAGES);
 
 	lmutex_lock(&gettxt_lock);
 
diff --git a/usr/src/lib/libc/port/gen/gtxt.c b/usr/src/lib/libc/port/gen/gtxt.c
index 80936415dc..bd08e47262 100644
--- a/usr/src/lib/libc/port/gen/gtxt.c
+++ b/usr/src/lib/libc/port/gen/gtxt.c
@@ -27,8 +27,6 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /* __gtxt(): Common part to gettxt() and pfmt()	*/
 
 #pragma	weak _setcat = setcat
@@ -260,6 +258,7 @@ __gtxt(const char *catname, int id, const char *dflt)
 	char	*curloc;
 	struct db_info *db;
 	int	err;
+	locale_t loc;
 
 	/* Check for invalid message id */
 	if (id < 0)
@@ -281,7 +280,8 @@ __gtxt(const char *catname, int id, const char *dflt)
 		lrw_unlock(&_rw_cur_cat);
 	}
 
-	curloc = setlocale(LC_MESSAGES, NULL);
+	loc = uselocale(NULL);
+	curloc = current_locale(loc, LC_MESSAGES);
 
 	/* First look up the cache */
 	db = lookup_cache(NULL, curloc, catname);
diff --git a/usr/src/lib/libc/port/gen/priv_str_xlate.c b/usr/src/lib/libc/port/gen/priv_str_xlate.c
index 763665c492..9796a2d858 100644
--- a/usr/src/lib/libc/port/gen/priv_str_xlate.c
+++ b/usr/src/lib/libc/port/gen/priv_str_xlate.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  *	priv_str_xlate.c - Privilege translation routines.
  */
@@ -432,6 +430,7 @@ char *
 priv_gettext(const char *priv)
 {
 	char file[MAXPATHLEN];
+	locale_t curloc;
 	const char *loc;
 	char	*ret;
 
@@ -439,8 +438,8 @@ priv_gettext(const char *priv)
 	if (priv_getbyname(priv) < 0)
 		return (NULL);
 
-	if ((loc = setlocale(LC_MESSAGES, NULL)) == NULL)
-		loc = "C";
+	curloc = uselocale(NULL);
+	loc = current_locale(curloc, LC_MESSAGES);
 
 	if (snprintf(file, sizeof (file),
 	    _DFLT_LOC_PATH "%s/LC_MESSAGES/priv_names", loc) < sizeof (file)) {
diff --git a/usr/src/lib/libc/port/gen/strerror.c b/usr/src/lib/libc/port/gen/strerror.c
index 213d964cf3..2269e2cf65 100644
--- a/usr/src/lib/libc/port/gen/strerror.c
+++ b/usr/src/lib/libc/port/gen/strerror.c
@@ -23,12 +23,13 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright 2015 Joyent, Inc.
+ */
 
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "lint.h"
 #include "_libc_gettext.h"
 #include <string.h>
@@ -40,13 +41,20 @@ extern const int _sys_index[];
 extern int _sys_num_err;
 
 char *
-strerror(int errnum)
+strerror_l(int errnum, locale_t loc)
 {
 	if (errnum < _sys_num_err && errnum >= 0)
-		return (_libc_gettext((char *)&_sys_errs[_sys_index[errnum]]));
+		return (_libc_gettext_l(&_sys_errs[_sys_index[errnum]],
+		    loc));
 
 	errno = EINVAL;
-	return (_libc_gettext("Unknown error"));
+	return (_libc_gettext_l("Unknown error", loc));
+}
+
+char *
+strerror(int errnum)
+{
+	return (strerror_l(errnum, uselocale(NULL)));
 }
 
 /*
diff --git a/usr/src/lib/libc/port/i18n/gettext.c b/usr/src/lib/libc/port/i18n/gettext.c
index 1922edae04..ef4a3db985 100644
--- a/usr/src/lib/libc/port/i18n/gettext.c
+++ b/usr/src/lib/libc/port/i18n/gettext.c
@@ -23,8 +23,9 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright 2015 Joyent, Inc.
+ */
 
 #pragma weak _bindtextdomain = bindtextdomain
 #pragma weak _textdomain = textdomain
@@ -125,7 +126,7 @@ gettext(const char *msg_id)
 
 	callout_lock_enter();
 	INIT_GT((char *)msg_id);
-	res = _real_gettext_u(NULL, msg_id, NULL, 0, LC_MESSAGES, 0);
+	res = _real_gettext_u(NULL, msg_id, NULL, 0, LC_MESSAGES, 0, NULL);
 	callout_lock_exit();
 	errno = errno_save;
 	return (res);
@@ -143,7 +144,21 @@ dgettext(const char *domain, const char *msg_id)
 
 	callout_lock_enter();
 	INIT_GT((char *)msg_id);
-	res = _real_gettext_u(domain, msg_id, NULL, 0, LC_MESSAGES, 0);
+	res = _real_gettext_u(domain, msg_id, NULL, 0, LC_MESSAGES, 0, NULL);
+	callout_lock_exit();
+	errno = errno_save;
+	return (res);
+}
+
+char *
+dgettext_l(const char *domain, const char *msg_id, locale_t loc)
+{
+	char	*res;
+	int	errno_save = errno;
+
+	callout_lock_enter();
+	INIT_GT((char *)msg_id);
+	res = _real_gettext_u(domain, msg_id, NULL, 0, LC_MESSAGES, 0, loc);
 	callout_lock_exit();
 	errno = errno_save;
 	return (res);
@@ -157,7 +172,7 @@ dcgettext(const char *domain, const char *msg_id, const int category)
 
 	callout_lock_enter();
 	INIT_GT((char *)msg_id);
-	res = _real_gettext_u(domain, msg_id, NULL, 0, category, 0);
+	res = _real_gettext_u(domain, msg_id, NULL, 0, category, 0, NULL);
 	callout_lock_exit();
 	errno = errno_save;
 	return (res);
@@ -171,7 +186,7 @@ ngettext(const char *msgid1, const char *msgid2, unsigned long int n)
 
 	callout_lock_enter();
 	INIT_GT((char *)msgid1);
-	res = _real_gettext_u(NULL, msgid1, msgid2, n, LC_MESSAGES, 1);
+	res = _real_gettext_u(NULL, msgid1, msgid2, n, LC_MESSAGES, 1, NULL);
 	callout_lock_exit();
 	errno = errno_save;
 	return (res);
@@ -186,7 +201,7 @@ dngettext(const char *domain, const char *msgid1, const char *msgid2,
 
 	callout_lock_enter();
 	INIT_GT((char *)msgid1);
-	res = _real_gettext_u(domain, msgid1, msgid2, n, LC_MESSAGES, 1);
+	res = _real_gettext_u(domain, msgid1, msgid2, n, LC_MESSAGES, 1, NULL);
 	callout_lock_exit();
 	errno = errno_save;
 	return (res);
@@ -201,7 +216,7 @@ dcngettext(const char *domain, const char *msgid1, const char *msgid2,
 
 	callout_lock_enter();
 	INIT_GT((char *)msgid1);
-	res = _real_gettext_u(domain, msgid1, msgid2, n, category, 1);
+	res = _real_gettext_u(domain, msgid1, msgid2, n, category, 1, NULL);
 	callout_lock_exit();
 	errno = errno_save;
 	return (res);
diff --git a/usr/src/lib/libc/port/i18n/gettext.h b/usr/src/lib/libc/port/i18n/gettext.h
index bbfdf66ade..ea52bd5c97 100644
--- a/usr/src/lib/libc/port/i18n/gettext.h
+++ b/usr/src/lib/libc/port/i18n/gettext.h
@@ -27,8 +27,6 @@
 #ifndef	_LIBC_PORT_I18N_GETTEXT_H
 #define	_LIBC_PORT_I18N_GETTEXT_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/param.h>
 #include <iconv.h>
 #include <synch.h>
@@ -149,7 +147,7 @@ struct msg_pack {
 	char	*msgfile;		/* msg catalog file to open */
 	char	*domain;		/* textdomain name */
 	char	*binding;		/* binding */
-	char	*locale;		/* locale */
+	const char	*locale;	/* locale */
 	char	*language;		/* LANGUAGE env */
 	caddr_t	addr;			/* mmap'ed address */
 	size_t	fsz;			/* file size */
@@ -192,7 +190,7 @@ extern Gettext_t	*global_gt;
 extern char	*_textdomain_u(const char *, char *);
 extern char	*_real_bindtextdomain_u(const char *, const char *, int);
 extern char	*_real_gettext_u(const char *, const char *,
-    const char *, unsigned long int, int, int);
+    const char *, unsigned long int, int, int, locale_t);
 extern char	*handle_mo(struct msg_pack *);
 
 extern int	gnu_setmsg(Msg_node *, char *, size_t);
diff --git a/usr/src/lib/libc/port/i18n/gettext_real.c b/usr/src/lib/libc/port/i18n/gettext_real.c
index ff94e7fd70..6045d000fe 100644
--- a/usr/src/lib/libc/port/i18n/gettext_real.c
+++ b/usr/src/lib/libc/port/i18n/gettext_real.c
@@ -23,8 +23,9 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright 2015 Joyent, Inc.
+ */
 
 #include "lint.h"
 #include "mtlib.h"
@@ -55,12 +56,13 @@ static char	*replace_nls_option(char *, const char *, char *,
 
 char *
 _real_gettext_u(const char *domain, const char *msgid1, const char *msgid2,
-    unsigned long int ln, int category, int plural)
+    unsigned long int ln, int category, int plural, locale_t loc)
 {
 	char	msgfile[MAXPATHLEN]; 	/* 1024 */
 	char	mydomain[TEXTDOMAINMAX + 1]; /* 256 + 1 */
 	char	*cur_binding;	/* points to current binding in list */
-	char	*cur_locale, *cur_domain, *result, *nlspath;
+	const char *cur_locale;
+	char	*cur_domain, *result, *nlspath;
 	char	*msgloc, *cb, *cur_domain_binding;
 	char	*language;
 	unsigned int	n = (unsigned int)ln;	/* we don't need long for n */
@@ -86,7 +88,9 @@ _real_gettext_u(const char *domain, const char *msgid1, const char *msgid2,
 	 * category may be LC_MESSAGES or LC_TIME
 	 * locale contains the value of 'category'
 	 */
-	cur_locale = setlocale(category, NULL);
+	if (loc == NULL)
+		loc = uselocale(NULL);
+	cur_locale = current_locale(loc, category);
 
 	language = getenv("LANGUAGE"); /* for GNU */
 	if (language) {
@@ -142,7 +146,7 @@ _real_gettext_u(const char *domain, const char *msgid1, const char *msgid2,
 		/* NLSPATH is set */
 		int	ret;
 
-		msgloc = setlocale(LC_MESSAGES, NULL);
+		msgloc = current_locale(loc, LC_MESSAGES);
 
 		ret = process_nlspath(cur_domain, msgloc,
 		    (const char *)nlspath, &cur_binding);
diff --git a/usr/src/lib/libc/port/i18n/gettext_util.c b/usr/src/lib/libc/port/i18n/gettext_util.c
index d00c0edb4a..2898773e31 100644
--- a/usr/src/lib/libc/port/i18n/gettext_util.c
+++ b/usr/src/lib/libc/port/i18n/gettext_util.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "lint.h"
 #include "mtlib.h"
 #include <ctype.h>
@@ -86,7 +84,8 @@ static const int	category_name_len[] = {
 char *
 mk_msgfile(struct msg_pack *mp)
 {
-	char	*p, *q;
+	const char *q;
+	char	*p;
 	const char	*catstr;
 	uint32_t	cblen, loclen, catlen, totallen;
 
diff --git a/usr/src/lib/libc/port/i18n/wdresolve.c b/usr/src/lib/libc/port/i18n/wdresolve.c
index f5d137008d..3e8402de94 100644
--- a/usr/src/lib/libc/port/i18n/wdresolve.c
+++ b/usr/src/lib/libc/port/i18n/wdresolve.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "lint.h"
 #include "mtlib.h"
 #include <sys/types.h>
@@ -64,13 +62,15 @@ _wdinitialize(void)
 	char	wdmodpath[PATH_MAX];
 	char	*loc;
 	size_t	loclen;
+	locale_t	curloc;
 
 	initialized = 1;
 
 	if (modhandle)
 		(void) dlclose(modhandle);
 
-	loc = setlocale(LC_CTYPE, NULL); /* this never return NULL */
+	curloc = uselocale(NULL);
+	loc = current_locale(curloc, LC_CTYPE);
 	loclen = strlen(loc);
 	if (_DFLTLOCPATH_LEN + loclen + _WDMODPATH_LEN >= sizeof (wdmodpath)) {
 		/* pathname too long */
diff --git a/usr/src/lib/libc/port/locale/setlocale.c b/usr/src/lib/libc/port/locale/setlocale.c
index e0a56ef8de..18628a3135 100644
--- a/usr/src/lib/libc/port/locale/setlocale.c
+++ b/usr/src/lib/libc/port/locale/setlocale.c
@@ -51,13 +51,13 @@
 #include "../i18n/_loc_path.h"
 #include "localeimpl.h"
 #include "../i18n/_locale.h"
+#include "libc.h"
 
 /*
  * Path to locale storage directory.  See ../i18n/_loc_path.h
  */
 char	*_PathLocale = _DFLT_LOC_PATH;
 
-static char	*current_locale(locale_t, int);
 static void	install_legacy(locale_t, int);
 
 static mutex_t setlocale_lock = DEFAULTMUTEX;
@@ -119,7 +119,7 @@ setlocale(int category, const char *locname)
 	return (current_locale(loc, category));
 }
 
-static char *
+char *
 current_locale(locale_t loc, int cat)
 {
 	switch (cat) {
diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers
index 904cd18ca5..128be0f8b1 100644
--- a/usr/src/lib/libc/port/mapfile-vers
+++ b/usr/src/lib/libc/port/mapfile-vers
@@ -93,6 +93,11 @@ $if _x86 && _ELF64
 $add amd64
 $endif
 
+SYMBOL_VERSION ILLUMOS_0.14 {	# strerror_l
+    protected:
+	strerror_l;
+} ILLUMOS_0.13;
+
 SYMBOL_VERSION ILLUMOS_0.13 {	# eventfd
     protected:
 	eventfd;
diff --git a/usr/src/man/man3c/Makefile b/usr/src/man/man3c/Makefile
index 975c56e921..f0eff75478 100644
--- a/usr/src/man/man3c/Makefile
+++ b/usr/src/man/man3c/Makefile
@@ -1170,6 +1170,7 @@ MANLINKS=	FD_CLR.3c				\
 	 	strcspn.3c				\
 	 	strdup.3c				\
 	 	strdupa.3c				\
+	 	strerror_l.3c				\
 	 	strerror_r.3c				\
 	 	strfmon_l.3c				\
 	 	strftime_l.3c				\
@@ -2166,6 +2167,7 @@ sig2str.3c				:= LINKSRC = str2sig.3c
 
 strcoll_l.3c				:= LINKSRC = strcoll.3c
 
+strerror_l.3c				:= LINKSRC = strerror.3c
 strerror_r.3c				:= LINKSRC = strerror.3c
 
 strfmon_l.3c				:= LINKSRC = strfmon.3c
diff --git a/usr/src/man/man3c/newlocale.3c b/usr/src/man/man3c/newlocale.3c
index 3f0c652d5a..b5102954e5 100644
--- a/usr/src/man/man3c/newlocale.3c
+++ b/usr/src/man/man3c/newlocale.3c
@@ -21,7 +21,7 @@ duplocale, freelocale, newlocale \- create, duplicate, and destroy locale object
 .nf
 #include <locale.h>
 
-\fBlocale_t\fR \fBnewlocale\fR(\fBint\fR \fIcategory_mask\fR, \fBconst char *\fR \fIlocale\fR,
+\fBlocale_t\fR \fBnewlocale\fR(\fBint\fR \fIcategory_mask\fR, \fBconst char *\fR\fIlocale\fR,
     \fBlocale_t\fR \fIbase\fR);
 .fi
 .LP
diff --git a/usr/src/man/man3c/strerror.3c b/usr/src/man/man3c/strerror.3c
index d343e9b4b4..1694c42617 100644
--- a/usr/src/man/man3c/strerror.3c
+++ b/usr/src/man/man3c/strerror.3c
@@ -1,4 +1,5 @@
 '\" te
+.\" Copyright 2015, Joyent, Inc.
 .\" Copyright (c) 2005, Sun Microsystems, Inc.  All Rights Reserved.
 .\" Copyright 1989 AT&T
 .\" Portions Copyright (c) 2001, the Institute of Electrical and Electronics Engineers, Inc. and The Open Group. All Rights Reserved.
@@ -9,9 +10,9 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH STRERROR 3C "Mar 31, 2005"
+.TH STRERROR 3C "Aug 17, 2015"
 .SH NAME
-strerror, strerror_r \- get error message string
+strerror, strerror_r, strerror_l \- get error message string
 .SH SYNOPSIS
 .LP
 .nf
@@ -25,8 +26,11 @@ strerror, strerror_r \- get error message string
 \fBint\fR \fBstrerror_r\fR(\fBint\fR \fIerrnum\fR, \fBchar *\fR\fIstrerrbuf\fR, \fBsize_t\fR  \fIbuflen\fR);
 .fi
 
+.LP
+.nf
+\fBchar *\fR\fBstrerror_l\fR(\fBint\fR \fIerrnum\fR, \fBlocale_t\fR \fIloc\fR);
+
 .SH DESCRIPTION
-.sp
 .LP
 The \fBstrerror()\fR function maps the error number in \fIerrnum\fR to an error
 message string, and returns a pointer to that string. It uses the same set of
@@ -35,23 +39,35 @@ overwritten.
 .sp
 .LP
 The \fBstrerror_r()\fR function maps the error number in \fIerrnum\fR to
-anerror message string and returns the string in the buffer pointed to by
+an error message string and returns the string in the buffer pointed to by
 \fIstrerrbuf\fR with length \fIbuflen\fR.
-.SH RETURN VALUES
 .sp
 .LP
-Upon successful completion, \fBstrerror()\fR returns a pointer to the generated
-message string. Otherwise, it sets \fBerrno\fR and returns a pointer to an
-error message string. It returns the string "Unknown error" if \fIerrnum\fR is
-not a valid error number.
+The \fBstrerror_l()\fR function maps the error number in \fIerrnum\fR to
+an error message string in the locale indicated by \fIloc\fR.  The
+returned string should not be overwritten. If \fIloc\fR is passed the
+\fBNULL\fR pointer, then the locale of the calling thread's current locale
+will be used instead.
+.sp
+.LP
+Because the \fBstrerror()\fR and \fBstrerror_l()\fR functions, return localized
+strings in the event of an unknown error, one must use the value of \fBerrno\fR
+to detect an error. Callers should first set \fBerrno\fR to \fB0\fR before the
+call to either function and then check the value of \fBerrno\fR after the call.
+If the value of \fBerrno\fR is non-zero then an error has occurred.
+.SH RETURN VALUES
+.LP
+Upon successful completion, \fBstrerror()\fR and \fBstrerror_l()\fR return a
+pointer to the generated message string. Otherwise, they set \fBerrno\fR and
+returns a pointer to an error message string. They return the localized string
+"Unknown error" if \fIerrnum\fR is not a valid error number.
 .sp
 .LP
 Upon successful completion, \fBstrerror_r()\fR returns 0.  Otherwise it sets
 \fBerrno\fR and returns the value of \fBerrno\fR to indicate the error. It
-returns the string "Unknown error" in the buffer pointed to by \fIstrerrbuf\fR
-if \fIerrnum\fR is not a valid error number.
+returns the localized string "Unknown error" in the buffer pointed to by
+\fIstrerrbuf\fR if \fIerrnum\fR is not a valid error number.
 .SH ERRORS
-.sp
 .LP
 These functions may fail if:
 .sp
@@ -77,12 +93,11 @@ generated message string.
 .RE
 
 .SH USAGE
-.sp
 .LP
 Messages returned from these functions are in the native language specified by
-the \fBLC_MESSAGES\fR locale category. See \fBsetlocale\fR(3C).
+the \fBLC_MESSAGES\fR locale category. See \fBsetlocale\fR(3C) and
+\fBuselocale\fR(3C).
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -100,7 +115,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBgettext\fR(3C), \fBperror\fR(3C), \fBsetlocale\fR(3C), \fBattributes\fR(5),
-\fBstandards\fR(5)
+\fBgettext\fR(3C), \fBperror\fR(3C), \fBsetlocale\fR(3C), \fBuselocale\fR(3C),
+\fBattributes\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man3lib/libc.3lib b/usr/src/man/man3lib/libc.3lib
index 18d3e9416f..0ed2650dd3 100644
--- a/usr/src/man/man3lib/libc.3lib
+++ b/usr/src/man/man3lib/libc.3lib
@@ -6,7 +6,7 @@
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
 .\" Copyright 2011 by Delphix.  All rights reserved.
-.TH LIBC 3LIB "Jan 14, 2014"
+.TH LIBC 3LIB "Sep 02, 2015"
 .SH NAME
 libc \- C library
 .SH DESCRIPTION
@@ -681,7 +681,7 @@ l l .
 \fBstrcmp\fR	\fBstrcoll\fR
 \fBstrcpy\fR	\fBstrcspn\fR
 \fBstrdup\fR	\fBstrerror\fR
-\fBstrerror_r\fR
+\fBstrerror_l\fR	\fBstrerror_r\fR
 \fBstrfmon\fR	\fBstrfmon_l\fR
 \fBstrftime\fR	\fBstrftime_l\fR
 \fBstring_to_decimal\fR
diff --git a/usr/src/pkg/manifests/system-library.man3c.inc b/usr/src/pkg/manifests/system-library.man3c.inc
index 85b54e1430..3b67d7408b 100644
--- a/usr/src/pkg/manifests/system-library.man3c.inc
+++ b/usr/src/pkg/manifests/system-library.man3c.inc
@@ -1228,6 +1228,7 @@ link path=usr/share/man/man3c/strcpy.3c target=string.3c
 link path=usr/share/man/man3c/strcspn.3c target=string.3c
 link path=usr/share/man/man3c/strdup.3c target=string.3c
 link path=usr/share/man/man3c/strdupa.3c target=string.3c
+link path=usr/share/man/man3c/strerror_l.3c target=strerror.3c
 link path=usr/share/man/man3c/strerror_r.3c target=strerror.3c
 link path=usr/share/man/man3c/strfmon_l.3c target=strfmon.3c
 link path=usr/share/man/man3c/strftime_l.3c target=strftime.3c
diff --git a/usr/src/pkg/manifests/system-test-libctest.mf b/usr/src/pkg/manifests/system-test-libctest.mf
index 7494a6b518..e4e043ceca 100644
--- a/usr/src/pkg/manifests/system-test-libctest.mf
+++ b/usr/src/pkg/manifests/system-test-libctest.mf
@@ -29,6 +29,16 @@ dir path=opt/libc-tests/runfiles
 dir path=opt/libc-tests/tests
 dir path=opt/libc-tests/tests/random
 dir path=opt/libc-tests/tests/symbols
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/locale
+dir path=usr/lib/locale/zz_AA.UTF-8
+dir path=usr/lib/locale/zz_AA.UTF-8/LC_COLLATE
+dir path=usr/lib/locale/zz_AA.UTF-8/LC_CTYPE
+dir path=usr/lib/locale/zz_AA.UTF-8/LC_MESSAGES
+dir path=usr/lib/locale/zz_AA.UTF-8/LC_MONETARY
+dir path=usr/lib/locale/zz_AA.UTF-8/LC_NUMERIC
+dir path=usr/lib/locale/zz_AA.UTF-8/LC_TIME
 file path=opt/libc-tests/README mode=0444
 file path=opt/libc-tests/bin/libctest mode=0555
 file path=opt/libc-tests/cfg/README mode=0444
@@ -44,6 +54,7 @@ file path=opt/libc-tests/cfg/symbols/pthread_h.cfg mode=0444
 file path=opt/libc-tests/cfg/symbols/signal_h.cfg mode=0444
 file path=opt/libc-tests/cfg/symbols/stdio_h.cfg mode=0444
 file path=opt/libc-tests/cfg/symbols/stdlib_h.cfg mode=0444
+file path=opt/libc-tests/cfg/symbols/string_h.cfg mode=0444
 file path=opt/libc-tests/cfg/symbols/strings_h.cfg mode=0444
 file path=opt/libc-tests/cfg/symbols/sys_stat_h.cfg mode=0444
 file path=opt/libc-tests/cfg/symbols/sys_time_h.cfg mode=0444
@@ -53,6 +64,7 @@ file path=opt/libc-tests/cfg/symbols/unistd_h.cfg mode=0444
 file path=opt/libc-tests/cfg/symbols/wchar_h.cfg mode=0444
 file path=opt/libc-tests/cfg/symbols/wctype_h.cfg mode=0444
 file path=opt/libc-tests/runfiles/default.run mode=0444
+file path=opt/libc-tests/tests/catopen mode=0555
 file path=opt/libc-tests/tests/fpround_test mode=0555
 file path=opt/libc-tests/tests/fpround_test.$(ARCH) mode=0555
 file path=opt/libc-tests/tests/fpround_test.$(ARCH64) mode=0555
@@ -62,6 +74,7 @@ file path=opt/libc-tests/tests/newlocale_test.$(ARCH64) mode=0555
 file path=opt/libc-tests/tests/nl_langinfo_test mode=0555
 file path=opt/libc-tests/tests/nl_langinfo_test.$(ARCH) mode=0555
 file path=opt/libc-tests/tests/nl_langinfo_test.$(ARCH64) mode=0555
+file path=opt/libc-tests/tests/priv_gettext mode=0555
 file path=opt/libc-tests/tests/random/arc4key.ksh mode=0555
 file path=opt/libc-tests/tests/random/arc4random mode=0555
 file path=opt/libc-tests/tests/random/arc4random_fork mode=0555
@@ -82,6 +95,7 @@ file path=opt/libc-tests/tests/random/inz_region mode=0555
 file path=opt/libc-tests/tests/random/inz_split mode=0555
 file path=opt/libc-tests/tests/random/inz_split_vpp mode=0555
 file path=opt/libc-tests/tests/random/inz_vpp mode=0555
+file path=opt/libc-tests/tests/strerror mode=0555
 file path=opt/libc-tests/tests/symbols/setup mode=0555
 file path=opt/libc-tests/tests/symbols/symbols_test.$(ARCH) mode=0555
 file path=opt/libc-tests/tests/symbols/symbols_test.$(ARCH64) mode=0555
@@ -91,6 +105,14 @@ file path=opt/libc-tests/tests/wcsrtombs_test.$(ARCH64) mode=0555
 file path=opt/libc-tests/tests/wctype_test mode=0555
 file path=opt/libc-tests/tests/wctype_test.$(ARCH) mode=0555
 file path=opt/libc-tests/tests/wctype_test.$(ARCH64) mode=0555
+file path=usr/lib/locale/zz_AA.UTF-8/LC_COLLATE/LCL_DATA mode=0444
+file path=usr/lib/locale/zz_AA.UTF-8/LC_CTYPE/LCL_DATA mode=0444
+file path=usr/lib/locale/zz_AA.UTF-8/LC_MESSAGES/LCL_DATA mode=0444
+file path=usr/lib/locale/zz_AA.UTF-8/LC_MESSAGES/SUNW_OST_OSLIB.mo mode=0444
+file path=usr/lib/locale/zz_AA.UTF-8/LC_MESSAGES/priv_names mode=0444
+file path=usr/lib/locale/zz_AA.UTF-8/LC_MONETARY/LCL_DATA mode=0444
+file path=usr/lib/locale/zz_AA.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
+file path=usr/lib/locale/zz_AA.UTF-8/LC_TIME/LCL_DATA mode=0444
 hardlink path=opt/libc-tests/tests/symbols/ctype_h target=setup
 hardlink path=opt/libc-tests/tests/symbols/dirent_h target=setup
 hardlink path=opt/libc-tests/tests/symbols/fcntl_h target=setup
@@ -101,6 +123,7 @@ hardlink path=opt/libc-tests/tests/symbols/pthread_h target=setup
 hardlink path=opt/libc-tests/tests/symbols/signal_h target=setup
 hardlink path=opt/libc-tests/tests/symbols/stdio_h target=setup
 hardlink path=opt/libc-tests/tests/symbols/stdlib_h target=setup
+hardlink path=opt/libc-tests/tests/symbols/string_h target=setup
 hardlink path=opt/libc-tests/tests/symbols/strings_h target=setup
 hardlink path=opt/libc-tests/tests/symbols/sys_stat_h target=setup
 hardlink path=opt/libc-tests/tests/symbols/sys_time_h target=setup
diff --git a/usr/src/test/libc-tests/cfg/Makefile b/usr/src/test/libc-tests/cfg/Makefile
index e4c43f3d7c..37b6b53c9f 100644
--- a/usr/src/test/libc-tests/cfg/Makefile
+++ b/usr/src/test/libc-tests/cfg/Makefile
@@ -29,6 +29,7 @@ CFGS = README \
 	symbols/signal_h.cfg \
 	symbols/stdio_h.cfg \
 	symbols/stdlib_h.cfg \
+	symbols/string_h.cfg \
 	symbols/strings_h.cfg \
 	symbols/sys_stat_h.cfg \
 	symbols/sys_time_h.cfg \
diff --git a/usr/src/test/libc-tests/cfg/symbols/string_h.cfg b/usr/src/test/libc-tests/cfg/symbols/string_h.cfg
new file mode 100644
index 0000000000..64506eb9dd
--- /dev/null
+++ b/usr/src/test/libc-tests/cfg/symbols/string_h.cfg
@@ -0,0 +1,33 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2015 Joyent, Inc.
+#
+
+#
+# Definitions found in string.h
+#
+
+#
+# Types.
+#
+type | locale_t | string.h | -ALL +SUSv4+
+
+#
+# Values.
+#
+
+#
+# Functions
+#
+func |	strerror_l	| char *	| int; locale_t	| string.h	|\
+	-ALL +SUSv4+
diff --git a/usr/src/test/libc-tests/runfiles/default.run b/usr/src/test/libc-tests/runfiles/default.run
index 50c8f6fa46..1be23194df 100644
--- a/usr/src/test/libc-tests/runfiles/default.run
+++ b/usr/src/test/libc-tests/runfiles/default.run
@@ -51,6 +51,10 @@ outputdir = /var/tmp/test_results
 [/opt/libc-tests/tests/random/arc4random_preforksig]
 [/opt/libc-tests/tests/random/arc4key.ksh]
 
+[/opt/libc-tests/tests/catopen]
+[/opt/libc-tests/tests/priv_gettext]
+[/opt/libc-tests/tests/strerror]
+
 [/opt/libc-tests/tests/symbols]
 pre = setup
 tests = [
@@ -64,6 +68,7 @@ tests = [
 	'signal_h',
 	'stdio_h',
 	'stdlib_h',
+	'string_h',
 	'strings_h',
 	'sys_stat_h',
 	'sys_time_h',
diff --git a/usr/src/test/libc-tests/tests/Makefile b/usr/src/test/libc-tests/tests/Makefile
index f50285b501..3aca9f17c1 100644
--- a/usr/src/test/libc-tests/tests/Makefile
+++ b/usr/src/test/libc-tests/tests/Makefile
@@ -14,7 +14,17 @@
 # Copyright 2015 Garrett D'Amore <garrett@damore.org>
 #
 
-SUBDIRS = fpround newlocale nl_langinfo symbols wcsrtombs wctype random
+SUBDIRS = \
+	catopen \
+	fpround \
+	newlocale \
+	nl_langinfo \
+	priv_gettext \
+	random \
+	strerror \
+	symbols \
+	wcsrtombs \
+	wctype
 
 include $(SRC)/Makefile.master
 include $(SRC)/test/Makefile.com
diff --git a/usr/src/test/libc-tests/tests/catopen/Makefile b/usr/src/test/libc-tests/tests/catopen/Makefile
new file mode 100644
index 0000000000..30a296fd5a
--- /dev/null
+++ b/usr/src/test/libc-tests/tests/catopen/Makefile
@@ -0,0 +1,51 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2015 Joyent, Inc.
+#
+
+include $(SRC)/Makefile.master
+
+ROOTOPTPKG = $(ROOT)/opt/libc-tests
+TESTDIR = $(ROOTOPTPKG)/tests
+
+PROGS = catopen
+
+include $(SRC)/cmd/Makefile.cmd
+include $(SRC)/test/Makefile.com
+
+CMDS = $(PROGS:%=$(TESTDIR)/%)
+$(CMDS) := FILEMODE = 0555
+
+all: $(PROGS)
+
+install: all $(CMDS)
+
+lint:
+
+clobber: clean
+	-$(RM) $(PROGS)
+
+clean:
+	-$(RM) *.o
+
+$(CMDS): $(TESTDIR) $(PROGS)
+
+
+$(TESTDIR):
+	$(INS.dir)
+
+$(TESTDIR)/%: %
+	$(INS.file)
+
+$(TESTDIR)/%: %
+	$(INS.file)
diff --git a/usr/src/test/libc-tests/tests/catopen/catopen.c b/usr/src/test/libc-tests/tests/catopen/catopen.c
new file mode 100644
index 0000000000..3748515c68
--- /dev/null
+++ b/usr/src/test/libc-tests/tests/catopen/catopen.c
@@ -0,0 +1,85 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2015 Joyent, Inc.
+ */
+
+#include <string.h>
+#include <locale.h>
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <nl_types.h>
+#include <sys/types.h>
+
+/*
+ * This is designed to check that we properly are honoring the global and
+ * per-thread locale when opening up a message catalog. To do this, we use the
+ * "TEST" message catalog which only exists in the system in the C/POSIX
+ * locales and thus alternate with our test locale zz_AA.UTF-8 which should not
+ * have it.
+ */
+
+#define	INVALID_CAT	((nl_catd)-1)
+
+static void
+catopen_verify(boolean_t find)
+{
+	nl_catd cat;
+
+	cat = catopen("TEST", NL_CAT_LOCALE);
+	if (find == B_TRUE) {
+		assert(cat != INVALID_CAT);
+		(void) catclose(cat);
+	} else {
+		assert(cat == INVALID_CAT);
+	}
+}
+
+int
+main(void)
+{
+	locale_t loc;
+
+	(void) setlocale(LC_ALL, "C");
+	catopen_verify(B_TRUE);
+
+	(void) setlocale(LC_ALL, "zz_AA.UTF-8");
+	catopen_verify(B_FALSE);
+
+	(void) setlocale(LC_MESSAGES, "C");
+	catopen_verify(B_TRUE);
+
+	(void) setlocale(LC_ALL, "C");
+	loc = newlocale(LC_MESSAGES_MASK, "zz_AA.UTF-8", NULL);
+	assert(loc != NULL);
+
+	catopen_verify(B_TRUE);
+	(void) uselocale(loc);
+	catopen_verify(B_FALSE);
+
+	(void) uselocale(LC_GLOBAL_LOCALE);
+	catopen_verify(B_TRUE);
+	freelocale(loc);
+
+	(void) setlocale(LC_ALL, "zz_AA.UTF-8");
+	catopen_verify(B_FALSE);
+
+	loc = newlocale(LC_MESSAGES_MASK, "C", NULL);
+	assert(loc != NULL);
+
+	catopen_verify(B_FALSE);
+	(void) uselocale(loc);
+	catopen_verify(B_TRUE);
+
+	return (0);
+}
diff --git a/usr/src/test/libc-tests/tests/priv_gettext/Makefile b/usr/src/test/libc-tests/tests/priv_gettext/Makefile
new file mode 100644
index 0000000000..8f8ee21fea
--- /dev/null
+++ b/usr/src/test/libc-tests/tests/priv_gettext/Makefile
@@ -0,0 +1,51 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2015 Joyent, Inc.
+#
+
+include $(SRC)/Makefile.master
+
+ROOTOPTPKG = $(ROOT)/opt/libc-tests
+TESTDIR = $(ROOTOPTPKG)/tests
+
+PROGS = priv_gettext
+
+include $(SRC)/cmd/Makefile.cmd
+include $(SRC)/test/Makefile.com
+
+CMDS = $(PROGS:%=$(TESTDIR)/%)
+$(CMDS) := FILEMODE = 0555
+
+all: $(PROGS)
+
+install: all $(CMDS)
+
+lint:
+
+clobber: clean
+	-$(RM) $(PROGS)
+
+clean:
+	-$(RM) *.o
+
+$(CMDS): $(TESTDIR) $(PROGS)
+
+
+$(TESTDIR):
+	$(INS.dir)
+
+$(TESTDIR)/%: %
+	$(INS.file)
+
+$(TESTDIR)/%: %
+	$(INS.file)
diff --git a/usr/src/test/libc-tests/tests/priv_gettext/priv_gettext.c b/usr/src/test/libc-tests/tests/priv_gettext/priv_gettext.c
new file mode 100644
index 0000000000..4f99a8130d
--- /dev/null
+++ b/usr/src/test/libc-tests/tests/priv_gettext/priv_gettext.c
@@ -0,0 +1,88 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2015 Joyent, Inc.
+ */
+
+#include <string.h>
+#include <locale.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <priv.h>
+
+/*
+ * This tests priv_gettext(). The priv_gettext() function always falls back to
+ * the C locale if it can't find anything. To deal with that, we've defined a
+ * dummy translation for the zz_AA.UTF-8 locale which has a translation for the
+ * 'dtrace_kernel' privilege.
+ *
+ * Normally 'dtrace_kernel' has the following description:
+ *
+ *   Allows DTrace kernel-level tracing.
+ *
+ * In the zz_AA.UTF-8 locale it has the following description:
+ *
+ *   Ah Elbereth Gilthoniel
+ *
+ * We explicitly verify that things respect the global locale and per-thread
+ * locale.
+ */
+
+static const char *def = "Allows DTrace kernel-level tracing.\n";
+static const char *trans = "Ah Elbereth Gilthoniel\n";
+
+static void
+priv_verify(const char *exp)
+{
+	char *res = priv_gettext("dtrace_kernel");
+	assert(res != NULL);
+	assert(strcmp(res, exp) == 0);
+	free(res);
+}
+
+int
+main(void)
+{
+	locale_t loc;
+
+	(void) setlocale(LC_ALL, "C");
+	priv_verify(def);
+
+	(void) setlocale(LC_ALL, "zz_AA.UTF-8");
+	priv_verify(trans);
+
+	(void) setlocale(LC_ALL, "C");
+	loc = newlocale(LC_MESSAGES_MASK, "zz_AA.UTF-8", NULL);
+	assert(loc != NULL);
+	priv_verify(def);
+
+	(void) uselocale(loc);
+	priv_verify(trans);
+
+	(void) uselocale(LC_GLOBAL_LOCALE);
+	priv_verify(def);
+	freelocale(loc);
+
+	(void) setlocale(LC_ALL, "zz_AA.UTF-8");
+	loc = newlocale(LC_MESSAGES_MASK, "C", NULL);
+	assert(loc != NULL);
+	priv_verify(trans);
+
+	(void) uselocale(loc);
+	priv_verify(def);
+
+	(void) uselocale(LC_GLOBAL_LOCALE);
+	priv_verify(trans);
+	freelocale(loc);
+
+	return (0);
+}
diff --git a/usr/src/test/libc-tests/tests/strerror/Makefile b/usr/src/test/libc-tests/tests/strerror/Makefile
new file mode 100644
index 0000000000..fcf3b45ed3
--- /dev/null
+++ b/usr/src/test/libc-tests/tests/strerror/Makefile
@@ -0,0 +1,51 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2015 Joyent, Inc.
+#
+
+include $(SRC)/Makefile.master
+
+ROOTOPTPKG = $(ROOT)/opt/libc-tests
+TESTDIR = $(ROOTOPTPKG)/tests
+
+PROGS = strerror
+
+include $(SRC)/cmd/Makefile.cmd
+include $(SRC)/test/Makefile.com
+
+CMDS = $(PROGS:%=$(TESTDIR)/%)
+$(CMDS) := FILEMODE = 0555
+
+all: $(PROGS)
+
+install: all $(CMDS)
+
+lint:
+
+clobber: clean
+	-$(RM) $(PROGS)
+
+clean:
+	-$(RM) *.o
+
+$(CMDS): $(TESTDIR) $(PROGS)
+
+
+$(TESTDIR):
+	$(INS.dir)
+
+$(TESTDIR)/%: %
+	$(INS.file)
+
+$(TESTDIR)/%: %
+	$(INS.file)
diff --git a/usr/src/test/libc-tests/tests/strerror/strerror.c b/usr/src/test/libc-tests/tests/strerror/strerror.c
new file mode 100644
index 0000000000..78dce8e04f
--- /dev/null
+++ b/usr/src/test/libc-tests/tests/strerror/strerror.c
@@ -0,0 +1,100 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2015 Joyent, Inc.
+ */
+
+#include <string.h>
+#include <locale.h>
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+/*
+ * This is designed to test strerorr and strerror_l's ability to react properly
+ * to being in various locales. This also serves as a regression test for
+ * illumos#6133.
+ *
+ * For this test, we utilize the poorly named 'zz_AA.UTF_8' locale which
+ * was created because it actually has a translation! It 'translates'
+ * the string:
+ *
+ * "No such file or directory" -> "It's a trap!"
+ *
+ * It's otherwise a boring en_US.UTF-8 locale under the hood.
+ *
+ * We explicitly want to verify the following cases:
+ *
+ * + strerror() honors the global locale before uselocale
+ * + strerror() honors the per-thread locale
+ * + strerror_l() always reflects the chosen locale
+ */
+
+static int err = ENOENT;
+static const char *en = "No such file or directory";
+static const char *trans = "It's a trap!";
+
+static void
+strerror_verify(const char *exp)
+{
+	const char *r;
+	errno = 0;
+	r = strerror(err);
+	assert(errno == 0);
+	assert(strcmp(r, exp) == 0);
+}
+
+static void
+strerror_l_verify(locale_t loc, const char *exp)
+{
+	const char *r;
+	errno = 0;
+	r = strerror_l(err, loc);
+	assert(errno == 0);
+	assert(strcmp(r, exp) == 0);
+}
+
+int
+main(void)
+{
+	locale_t loc;
+
+	(void) setlocale(LC_ALL, "C");
+	strerror_verify(en);
+
+	(void) setlocale(LC_ALL, "zz_AA.UTF-8");
+	strerror_verify(trans);
+
+	(void) setlocale(LC_MESSAGES, "C");
+	strerror_verify(en);
+
+	(void) setlocale(LC_ALL, "C");
+	loc = newlocale(LC_MESSAGES_MASK, "zz_AA.UTF-8", NULL);
+	assert(loc != NULL);
+
+	strerror_verify(en);
+	strerror_l_verify(NULL, en);
+	strerror_l_verify(loc, trans);
+
+	(void) uselocale(loc);
+	strerror_verify(trans);
+	strerror_l_verify(NULL, trans);
+	strerror_l_verify(loc, trans);
+
+	(void) uselocale(LC_GLOBAL_LOCALE);
+	strerror_verify(en);
+	strerror_l_verify(NULL, en);
+	strerror_l_verify(loc, trans);
+
+	freelocale(loc);
+	return (0);
+}
diff --git a/usr/src/test/libc-tests/tests/symbols/Makefile b/usr/src/test/libc-tests/tests/symbols/Makefile
index 9b9ceb0778..39947ee7b5 100644
--- a/usr/src/test/libc-tests/tests/symbols/Makefile
+++ b/usr/src/test/libc-tests/tests/symbols/Makefile
@@ -29,6 +29,7 @@ SYMTESTS = \
 	signal_h \
 	stdio_h \
 	stdlib_h \
+	string_h \
 	strings_h \
 	sys_stat_h \
 	sys_time_h \
diff --git a/usr/src/test/libc-tests/tests/symbols/symbols_test.c b/usr/src/test/libc-tests/tests/symbols/symbols_test.c
index fa96cfe73c..a20000fcd5 100644
--- a/usr/src/test/libc-tests/tests/symbols/symbols_test.c
+++ b/usr/src/test/libc-tests/tests/symbols/symbols_test.c
@@ -770,8 +770,10 @@ find_compiler(void)
 			break;
 		case 52:	/* GCC */
 			test_debugf(t, "Found GNU C");
-			c89flags = "-Wall -Werror -std=c89 " MFLAG;
-			c99flags = "-Wall -Werror -std=c99 " MFLAG;
+			c89flags = "-Wall -Werror -std=c89 -nostdinc "
+			    "-isystem /usr/include " MFLAG;
+			c99flags = "-Wall -Werror -std=c99 -nostdinc "
+			    "-isystem /usr/include " MFLAG;
 			if (extra_debug) {
 				test_debugf(t, "c89flags: %s", c89flags);
 				test_debugf(t, "c99flags: %s", c99flags);
author	Jerry Jelinek <jerry.jelinek@joyent.com>	2015-10-06 11:53:38 +0000
committer	Jerry Jelinek <jerry.jelinek@joyent.com>	2015-10-06 11:53:38 +0000
commit	aabf397c64f21eddc6f5719b6dc3168e8c27c4ff (patch)
tree	afc652569a993dd370b24fbf0285c1b0f4d62852 /usr/src
parent	e3cab2d72b5decf703884eca70da83ce7b7d365b (diff)
parent	b599bd937c305a895426e8c412ca920ce7824850 (diff)
download	illumos-joyent-aabf397c64f21eddc6f5719b6dc3168e8c27c4ff.tar.gz