This commit was manufactured by cvs2svn to create tagV0_1_114_4_1mdk

'V0_1_114_4_1mdk'.

5 files changed, 242 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index c1b41f3c..30f22496 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,101 @@
-2005-09-20 20:23  Olivier Blin <oblin at mandriva.com>
+2006-04-14 14:49  Gwenole Beauchesne <gbeauchesne at mandriva.com>
 
-	* ldetect-lst.spec: 0.1.115-1mdk
+	* ldetect-lst.spec, lst/pcitable: add i945GM id
+
+2006-04-14 08:25  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: Some ids are also Quadro NVS 110M/120M (Dell
+	  Latitude D820)
+
+2006-04-13 15:33  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec, lst/pcitable: - add ipw3945 ids - add realtek
+	  RTL-8168 id
+
+2006-04-13 15:16  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec, lst/Cards+, lst/pcitable: - add a new nvidia
+	  audio chipset - merge new nvidia ids from 1.0-8756 driver
+
+2006-04-07 16:40  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec: We will never make ldetect-lst (et al.)
+	  packages with simple release updates.  The version shall be
+	  incremented, always.
+
+2006-04-07 14:26  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec: typo
+
+2006-04-07 12:10  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec: add more intel public ids (benseley & napa
+	  platforms)
+
+2006-04-06 18:09  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: add more intel public ids (benseley & napa
+	  platforms)
+
+2006-04-05 15:27  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec, lst/pcitable: add 'gilgal' ethernet controller
+	  ids
+
+2006-04-05 15:19  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: migrate some mptscsih to mptspi / mptfc
+
+2006-03-28 16:43  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: add 3ware 9550SX id (3w-9xxx in 2.6.12-19mdk)
+
+2006-03-09 16:15  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec, lst/pcitable: add mptsas ids
+
+2006-02-21 16:41  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec: 0.1.114.1-1mdk
+
+2006-02-21 16:41  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: add ich8 & nineveh ids
+
+2005-11-07 19:09  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* ldetect-lst.spec: typo fix in 0.1.114-1.1.20060mdk
+
+2005-11-07 18:57  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* ldetect-lst.spec: 0.1.114-1.1.20060mdk
+
+2005-11-07 18:50  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* Makefile: (changelog) follow MDK-2006_0-update branch, not TRUNK
+	  anymore
+
+2005-10-07 16:15  Olivier Blin <oblin at mandriva.com>
+
+	* lst/pcitable: add another slamr entry (X-Book)
+
+2005-10-06 21:53  Olivier Blin <oblin at mandriva.com>
+
+	* lst/pcitable: add a new Hsf modem entry (IBM R52)
+
+2005-10-06 21:05  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* lst/usbtable: remove description of 0x0471:0x0311 as both
+	  PCVC740K and PCVC840K share the same ids; let the kernel extract
+	  the right name out of the USB device (#18946)
+
+2005-09-21 13:54  Olivier Blin <oblin at mandriva.com>
+
+	* lst/pcitable: add yet another slamr modem
+
+2005-09-21 13:45  Olivier Blin <oblin at mandriva.com>
+
+	* lst/pcitable: add another slamr modem
 
 2005-09-20 20:02  Olivier Blin <oblin at mandriva.com>
 
diff --git a/Makefile b/Makefile
index b1cea91d..d8b9bcf2 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ cvstag:
 log: changelog
 
 changelog: ../common/username
-	cvs2cl -U ../common/username -I ChangeLog --accum -F TRUNK
+	cvs2cl -U ../common/username -I ChangeLog --accum -F MDK-2006_0-update
 	rm -f ChangeLog.bak
 	cvs commit -m "Generated by cvs2cl the `LC_TIME=C date '+%d_%b'`" ChangeLog
 
diff --git a/ldetect-lst.spec b/ldetect-lst.spec
index 5c870308..51ac8a9a 100644
--- a/ldetect-lst.spec
+++ b/ldetect-lst.spec
@@ -1,6 +1,7 @@
 %define name ldetect-lst
-%define version 0.1.114
-%define release 1mdk
+%define version 0.1.114.4
+%define _with_unstable 1
+%define release %mkrel 1
 
 Name: %{name}
 Version: %{version}
@@ -64,6 +65,34 @@ fi
 %{_bindir}/*
 
 %changelog
+* Fri Apr 14 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.1.114.4-1mdk
+- add i945GM id
+- add ipw3945 ids
+- add realtek RTL-8168 id
+- add a new nvidia audio chipset
+- merge new nvidia ids from 1.0-8756 driver
+
+* Thu Apr  6 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.1.114.3-1mdk
+- add 'gilgal' ethernet controller ids
+- migrate some mptscsih to mptspi / mptfc
+- add more intel public ids (benseley & napa platforms)
+
+* Thu Mar  9 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.1.114.2-1mdk
+- add mptsas ids
+
+* Tue Feb 21 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.1.114.1-1mdk
+- add ich8 ids
+- add nineveh nic id
+
+* Mon Nov  7 2005 Thierry Vignaud <tvignaud@mandriva.com> 0.1.114-1.1.20060mdk
+- add 5 pci modem entries (blino):
+  o add a slamr entry for X-Book laptop
+  o add a new Hsf modem entry (IBM R52)
+  o add 3 other slamr modem entries
+- usbtable: remove description of 0x0471:0x0311 as both PCVC740K and
+  PCVC840K share the same ids; let the kernel extract the right name
+  out of the USB device (#18946)
+
 * Mon Sep 19 2005 Pixel <pixel@mandriva.com> 0.1.114-1mdk
 - fix update-ldetect-lst ordering of mixed *.lst and *.lst.gz
 
diff --git a/lst/Cards+ b/lst/Cards+
index c868681d..380b6729 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -1947,6 +1947,12 @@ SEE NVIDIA GeForce
 NAME NVIDIA GeForce 6800 (generic)
 SEE NVIDIA GeForce
 
+NAME NVIDIA GeForce 6 Series
+SEE NVIDIA GeForce
+
+NAME NVIDIA GeForce 7 Series
+SEE NVIDIA GeForce
+
 # IMS
 
 NAME IMS TwinTurbo (generic)
diff --git a/lst/pcitable b/lst/pcitable
index c7ea971f..0512d33a 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -161,22 +161,22 @@
 0x1000	0x0013	"sym53c8xx"	"Symbios|53c875a"
 0x1000	0x0020	"sym53c8xx"	"Symbios|53c1010-33 Ultra3 SCSI Adapter"
 0x1000	0x0021	"sym53c8xx"	"Symbios|53c1010-66 Ultra3 SCSI Adapter"
-0x1000	0x0030	"mptscsih"	"Symbios|53c1030"
+0x1000	0x0030	"mptspi"	"Symbios|53c1030"
 0x1000	0x0031	"unknown"	"LSI Logic|53C1030ZC PCI-X SCSI Controller"
-0x1000	0x0032	"mptscsih"	"LSI Logic / Symbios Logic|53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI"
+0x1000	0x0032	"mptspi"	"LSI Logic / Symbios Logic|53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI"
 0x1000	0x0033	"megaraid"	"LSI Logic / Symbios Logic|1030ZC_53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI"
 0x1000	0x0035	"unknown"	"LSI Logic|53C1035 PCI-X SCSI Controller"
 0x1000	0x0040	0x1000	0x0033	"megaraid_mbox"	"LSI Logic|MegaRAID SCSI 320-2XR"
 0x1000	0x0040	0x1000	0x0066	"megaraid_mbox"	"LSI Logic|MegaRAID SCSI 320-2XRWS"
 0x1000	0x0040	"mptscsih"	"LSI Logic / Symbios Logic|53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI"
 0x1000	0x0041	"unknown"	"LSI Logic / Symbios Logic|53C1035ZC PCI-X Fusion-MPT Dual Ultra320 SCSI"
-0x1000	0x0050	"unknown"	"LSI Logic / Symbios Logic|SAS1064 PCI-X Fusion-MPT SAS"
-0x1000	0x0054	"unknown"	"LSI Logic / Symbios Logic|SAS1068 PCI-X Fusion-MPT SAS"
-0x1000	0x0056	"unknown"	"LSI Logic / Symbios Logic|SAS1064E PCI-Express Fusion-MPT SAS"
-0x1000	0x0058	"unknown"	"LSI Logic / Symbios Logic|SAS1068E PCI-Express Fusion-MPT SAS"
-0x1000	0x005a	"unknown"	"LSI Logic / Symbios Logic|SAS1066E PCI-Express Fusion-MPT SAS"
+0x1000	0x0050	"mptsas"	"LSI Logic / Symbios Logic|SAS1064 PCI-X Fusion-MPT SAS"
+0x1000	0x0054	"mptsas"	"LSI Logic / Symbios Logic|SAS1068 PCI-X Fusion-MPT SAS"
+0x1000	0x0056	"mptsas"	"LSI Logic / Symbios Logic|SAS1064E PCI-Express Fusion-MPT SAS"
+0x1000	0x0058	"mptsas"	"LSI Logic / Symbios Logic|SAS1068E PCI-Express Fusion-MPT SAS"
+0x1000	0x005a	"mptsas"	"LSI Logic / Symbios Logic|SAS1066E PCI-Express Fusion-MPT SAS"
 0x1000	0x005c	"unknown"	"LSI Logic / Symbios Logic|SAS1064A PCI-X Fusion-MPT SAS"
-0x1000	0x005e	"unknown"	"LSI Logic / Symbios Logic|SAS1066 PCI-X Fusion-MPT SAS"
+0x1000	0x005e	"mptsas"	"LSI Logic / Symbios Logic|SAS1066 PCI-X Fusion-MPT SAS"
 0x1000	0x0060	"unknown"	"LSI Logic / Symbios Logic|SAS1078 PCI-X Fusion-MPT SAS"
 0x1000	0x0066	"megaraid"	"Symbios Logic Inc. / NCR|MegaRAID SCSI 320-2XRWS"
 0x1000	0x008f	"sym53c8xx"	"Symbios|53c875J"
@@ -190,19 +190,19 @@
 0x1000	0x0530	"megaraid"	"Symbios Logic Inc. / NCR|MegaRAID SCSI 320-0X"
 0x1000	0x0531	"megaraid"	"Symbios Logic Inc. / NCR|MegaRAID SCSI 320-4X"
 0x1000	0x0532	"megaraid"	"Symbios Logic Inc. / NCR|MegaRAID SCSI 320-2X"
-0x1000	0x0621	"mptfc"	"Symbios|FC909"
-0x1000	0x0622	"mptfc"	"Symbios|FC929"
+0x1000	0x0621	"mptfc"	"Symbios|FC909 Fibre Channel Adapter"
+0x1000	0x0622	"mptfc"	"Symbios|FC929 Fibre Channel Adapter"
 0x1000	0x0623	"mptscsih"	"Symbios|FC929 LAN"
-0x1000	0x0624	"mptfc"	"Symbios|FC919"
+0x1000	0x0624	"mptfc"	"Symbios|FC919 Fibre Channel Adapter"
 0x1000	0x0625	"mptscsih"	"Symbios|FC919 LAN"
-0x1000	0x0626	"mptfc"	"Symbios|FC929X"
+0x1000	0x0626	"mptfc"	"Symbios|FC929X Fibre Channel Adapter"
 0x1000	0x0627	"mptscsih"	"Symbios|FC929X_LAN"
-0x1000	0x0628	"mptfc"	"Symbios|FC919X"
+0x1000	0x0628	"mptfc"	"Symbios|FC919X Fibre Channel Adapter"
 0x1000	0x0629	"mptscsih"	"Symbios|FC919X_LAN"
 0x1000	0x0630	"mptscsih"	"LSI Logic|LSIFC920 Fibre Channel I/O Processor"
 0x1000	0x0640	"mptfc"	"LSI Logic / Symbios Logic|FC949X Fibre Channel Adapter"
 0x1000	0x0642	"mptfc"	"LSI Logic / Symbios Logic|FC939X Fibre Channel Adapter"
-0x1000	0x0646	"unknown"	"LSI Logic / Symbios Logic|FC949ES Fibre Channel Adapter"
+0x1000	0x0646	"mptfc"	"LSI Logic / Symbios Logic|FC949ES Fibre Channel Adapter"
 0x1000	0x0701	"yellowfin"	"Symbios|83C885 gigabit ethernet"
 0x1000	0x0702	"yellowfin"	"Symbios|Yellowfin G-NIC gigabit ethernet"
 0x1000	0x0804	"unknown"	"LSI Logic / Symbios Logic|SA2010"
@@ -2612,11 +2612,15 @@
 0x10de	0x003c	"unknown"	"nVidia Corporation|MCP04 USB Controller"
 0x10de	0x003d	"unknown"	"nVidia Corporation|MCP04 PCI Bridge"
 0x10de	0x003e	"sata_nv"	"nVidia Corporation|MCP04 Serial ATA Controller"
-0x10de	0x0040	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|nv40 [GeForce 6800 Ultra]"
-0x10de	0x0041	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|NV40 OS1RT00B30"
+0x10de	0x0040	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|NV40 [GeForce 6800 Ultra]"
+0x10de	0x0041	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|NV40 [GeForce 6800]"
 0x10de	0x0042	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|NV40.2"
-0x10de	0x0043	"Card:NVIDIA GeForce"	"nVidia Corporation|NV40.3"
-0x10de	0x0045	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|NV40 [GeForce 6800GT]"
+0x10de	0x0043	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|NV40 [GeForce 6800 XE]"
+0x10de	0x0044	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|NV40 [GeForce 6800 XT]"
+0x10de	0x0045	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|NV40 [GeForce 6800 GT]"
+0x10de	0x0046	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|NV40 [GeForce 6800 GT]"
+0x10de	0x0047	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|NV40 [GeForce 6800 GS]"
+0x10de	0x0048	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|NV40 [GeForce 6800 XT]"
 0x10de	0x0049	"Card:NVIDIA GeForce"	"nVidia Corporation|NV40GL"
 0x10de	0x004d	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV40GL [Quadro FX 4400]"
 0x10de	0x004e	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV40GL [Quadro FX 4000]"
@@ -2659,13 +2663,20 @@
 0x10de	0x008b	"unknown"	"nVidia Corporation|MCP2A PCI Bridge"
 0x10de	0x008c	"forcedeth"	"nVidia Corp.|Ethernet controller"
 0x10de	0x008e	"sata_nv"	"nVidia Corp.|nForce2 Serial ATA Controller"
-0x10de	0x0091	"unknown"	"nVidia Corporation|GeForce 7800 GTX"
+0x10de	0x0090	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7800 GTX"
+0x10de	0x0091	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7800 GTX"
+0x10de	0x0092	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7800 GT"
+0x10de	0x0093	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7800 GS"
+0x10de	0x0098	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce Go 7800"
+0x10de	0x0099	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce Go 7800 GTX"
+0x10de	0x009d	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|Quadro FX 4500"
 0x10de	0x00a0	"Card:RIVA TNT2"	"nVidia Corp.|Riva TNT2"
-0x10de	0x00c0	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV41.0"
-0x10de	0x00c1	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV41.1"
-0x10de	0x00c2	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV41.2"
-0x10de	0x00c8	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|GeForce Go 6800"
-0x10de	0x00c9	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|GeForce Go 6800 Ultra"
+0x10de	0x00c0	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|GeForce 6800 GS"
+0x10de	0x00c1	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|GeForce 6800"
+0x10de	0x00c2	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|GeForce 6800 LE"
+0x10de	0x00c3	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|GeForce 6800 XT"
+0x10de	0x00c8	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|GeForce Go 6800"
+0x10de	0x00c9	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|GeForce Go 6800 Ultra"
 0x10de	0x00cc	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|Quadro FX Go1400"
 0x10de	0x00cd	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV41 [Quadro FX 3450/4000 SDI]"
 0x10de	0x00ce	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|Quadro FX 1400"
@@ -2697,7 +2708,10 @@
 0x10de	0x00f0	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV40 [GeForce 6800/GeForce 6800 Ultra]"
 0x10de	0x00f1	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV43 [GeForce 6600/GeForce 6600 GT]"
 0x10de	0x00f2	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV43 [GeForce 6600 GT]"
-0x10de	0x00f3	"unknown"	"nVidia Corporation|NV43 [GeForce 6200]"
+0x10de	0x00f3	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|NV43 [GeForce 6200]"
+0x10de	0x00f4	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|GeForce 6600 LE"
+0x10de	0x00f5	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7800 GS"
+0x10de	0x00f6	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|GeForce 6600 GS"
 0x10de	0x00f8	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV45GL [Quadro FX 3400 PCI-Express]"
 0x10de	0x00f9	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV40 [GeForce 6800 Ultra]"
 0x10de	0x00fa	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV36 [GeForce FX 5750 PCI-Express]"
@@ -2714,21 +2728,21 @@
 0x10de	0x0111	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corp.|NV11 geForce2 100/200"
 0x10de	0x0112	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corp.|NV11 Geforce2 Go"
 0x10de	0x0113	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corp.|NV11 Quadro2 MXR/EX/Go"
-0x10de	0x0140	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV43 [MSI NX6600GT-TD128E]"
-0x10de	0x0141	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|Geforce NX 6600"
-0x10de	0x0142	"Card:NVIDIA GeForce"	"nVidia Corporation|Unknown (generic)"
+0x10de	0x0140	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|GeForce 6600 GT"
+0x10de	0x0141	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|GeForce 6600"
+0x10de	0x0142	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|GeForce 6600 LE"
 0x10de	0x0143	"Card:NVIDIA GeForce"	"nVidia Corporation|Unknown (generic)"
 0x10de	0x0144	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|GeForce Go 6600"
 0x10de	0x0145	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|GeForce 6610 XL"
 0x10de	0x0146	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|GeForce Go 6600 TE/6200 TE"
 0x10de	0x0147	"Card:NVIDIA GeForce"	"nVidia Corporation|Unknown (generic)"
 0x10de	0x0148	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|GeForce Go 6600"
-0x10de	0x0149	"Card:NVIDIA GeForce"	"nVidia Corporation|Unknown (generic)"
+0x10de	0x0149	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|GeForce Go 6600 GT"
 0x10de	0x014b	"Card:NVIDIA GeForce"	"nVidia Corporation|Unknown (generic)"
 0x10de	0x014c	"Card:NVIDIA GeForce"	"nVidia Corporation|Unknown (generic)"
 0x10de	0x014d	"Card:NVIDIA GeForce"	"nVidia Corporation|Unknown (generic)"
 0x10de	0x014e	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|Quadro FX 540"
-0x10de	0x014f	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|Geforce NX 6200"
+0x10de	0x014f	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|GeForce 6200"
 0x10de	0x0150	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corp.|NV15 Geforce2 GTS"
 0x10de	0x0151	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corp.|NV15 Geforce2 Ti"
 0x10de	0x0152	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corp.|NV15 Bladerunner (GeForce2 Ultra)"
@@ -2739,9 +2753,9 @@
 0x10de	0x0163	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|"
 0x10de	0x0164	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|GeForce Go 6200"
 0x10de	0x0165	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV44 [Quadro NVS 285]"
-0x10de	0x0166	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|GeForce Go 6250"
-0x10de	0x0167	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|GeForce Go 6200"
-0x10de	0x0168	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|GeForce Go 6250"
+0x10de	0x0166	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|GeForce Go 6400"
+0x10de	0x0167	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|GeForce Go 6200"
+0x10de	0x0168	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|GeForce Go 6400"
 0x10de	0x0169	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|"
 0x10de	0x016b	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|"
 0x10de	0x016c	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|"
@@ -2793,7 +2807,11 @@
 0x10de	0x01c1	"slamr"	"nVidia Corp.|Intel 537 [nForce MC97 Modem]"
 0x10de	0x01c2	"usb-ohci"	"nVidia Corp.|nForce USB Controller"
 0x10de	0x01c3	"forcedeth"	"nVidia Corp.|nForce MCP Networking Adapter"
+0x10de	0x01d1	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7300 LE"
+0x10de	0x01d7	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|Quadro NVS 110M / GeForce Go 7300"
+0x10de	0x01d8	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|Quadro NVS 120M / GeForce Go 7400"
 0x10de	0x01da	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV36 [Quadro FX 1100]"
+0x10de	0x01df	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7300 GS"
 0x10de	0x01e0	"nvidia-agp"	"nVidia Corp.|nForce2 AGP Controller"
 0x10de	0x01e1	"unknown"	"NVIDIA Corp.|nForce2 AGP Controller"
 0x10de	0x01e8	"agpgart"	"nVidia Corp.|nForce2 AGP Host to PCI Bridge"
@@ -2812,15 +2830,16 @@
 0x10de	0x0211	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|GeForce 6800"
 0x10de	0x0212	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|GeForce 6800 LE"
 0x10de	0x0215	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|GeForce 6800 GT"
+0x10de	0x0218	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|GeForce 6800 XT"
 0x10de	0x021d	"Card:NVIDIA GeForce"	"nVidia Corporation|Unknown (generic)"
 0x10de	0x021e	"Card:NVIDIA GeForce"	"nVidia Corporation|Unknown (generic)"
 0x10de	0x0220	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|"
 0x10de	0x0221	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corporation|GeForce 6200"
 0x10de	0x0222	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|"
 0x10de	0x0228	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|"
-0x10de	0x0240	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x0240	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|C51PV [GeForce 6150]"
 0x10de	0x0241	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
-0x10de	0x0242	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x0242	"Card:NVIDIA GeForce 6 Series"	"nVidia Corporation|C51G [GeForce 6100]"
 0x10de	0x0243	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
 0x10de	0x0244	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
 0x10de	0x0245	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
@@ -2852,7 +2871,7 @@
 0x10de	0x0268	"forcedeth"	"nVidia Corporation|MCP51 Ethernet Controller"
 0x10de	0x0269	"forcedeth"	"nVidia Corporation|MCP51 Ethernet Controller"
 0x10de	0x026a	"unknown"	"nVidia Corporation|MCP51 MCI"
-0x10de	0x026b	"unknown"	"nVidia Corporation|MCP51 AC97 Audio Controller"
+0x10de	0x026b	"snd-intel8x0"	"nVidia Corporation|MCP51 AC97 Audio Controller"
 0x10de	0x026c	"snd-hda-intel"	"nVidia Corporation|MCP51 High Definition Audio"
 0x10de	0x026d	"unknown"	"nVidia Corporation|MCP51 USB Controller"
 0x10de	0x026e	"unknown"	"nVidia Corporation|MCP51 USB Controller"
@@ -2869,7 +2888,10 @@
 0x10de	0x0288	"Card:NVIDIA GeForce4 (generic)"	"nVidia|Quadro4 980 XGL"
 0x10de	0x0289	"Card:NVIDIA GeForce4 (generic)"	"nVidia|Quadro4 780 XGL"
 0x10de	0x028c	"Card:NVIDIA GeForce4 (generic)"	"nVidia|Quadro4 700 GoGL"
+0x10de	0x0290	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7900 GTX"
+0x10de	0x0291	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7900 GT"
 0x10de	0x02a0	"Card:NVIDIA GeForce3 (xbox)"	"nVidia|GeForce3 Integrated (Xbox)"
+0x10de	0x02e1	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7600 GS"
 0x10de	0x02f0	"unknown"	"nVidia Corporation|C51 Host Bridge"
 0x10de	0x02f1	"unknown"	"nVidia Corporation|C51 Host Bridge"
 0x10de	0x02f2	"unknown"	"nVidia Corporation|C51 Host Bridge"
@@ -2960,6 +2982,9 @@
 0x10de	0x037a	"unknown"	"nVidia Corporation|MCP55 Memory Controller"
 0x10de	0x037e	"unknown"	"nVidia Corporation|MCP55 SATA Controller"
 0x10de	0x037f	"unknown"	"nVidia Corporation|MCP55 SATA Controller"
+0x10de	0x0391	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7600 GT"
+0x10de	0x0392	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce 7600 GS"
+0x10de	0x0398	"Card:NVIDIA GeForce 7 Series"	"nVidia Corporation|GeForce Go 7600"
 0x10df	0x10df	"lpfc"	"Emulex Corp.|Light Pulse Fibre Channel Adapter"
 0x10df	0x1ae5	"lpfc"	"Emulex Corp.|LP6000 Fibre Channel Host Adapter"
 0x10df	0x1ae6	"lpfc"	"Emulex Corp.|LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)"
@@ -3088,6 +3113,7 @@
 0x10ec	0x8139	0x8e2e	0x7100	"8139too"	"Realtek Semiconductor Co., Ltd.|KF-230TX/2"
 0x10ec	0x8139	0xa0a0	0x0007	"8139too"	"Realtek Semiconductor Co., Ltd.|ALN-325C"
 0x10ec	0x8139	"8139too"	"Realtek|RTL-8139"
+0x10ec	0x8168	"r8169"	"Realtek|RTL-8168 PCI-E Gigabit Ethernet"
 0x10ec	0x8169	"r8169"	"Realtek|RTL-8169"
 0x10ec	0x8180	"r8180"	"Realtek Semiconductor|RTL8180 Realtek RTL8180 Wireless LAN (Mini-)PCI NIC"
 0x10ec	0x8185	"r8180"	""
@@ -4861,6 +4887,7 @@
 0x13c1	0x1000	"3w-xxxx"	"3ware Inc|3ware ATA-RAID"
 0x13c1	0x1001	"3w-xxxx"	"3ware Inc|3ware 7000-series ATA-RAID"
 0x13c1	0x1002	"3w-9xxx"	"3ware Inc|3ware 9XXX-series ATA-RAID"
+0x13c1	0x1003	"3w-9xxx"	"3ware Inc|3ware 9XXX-series ATA-RAID"
 0x13c6	0x0520	"unknown"	"Condor Engineering Inc|CEI-520 A429 Card"
 0x13c6	0x0620	"unknown"	"Condor Engineering Inc|CEI-620 A429 Card"
 0x13c6	0x0820	"unknown"	"Condor Engineering Inc|CEI-820 A429 Card"
@@ -6069,6 +6096,7 @@
 0x8086	0x1043	0x8086	0x2762	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
 0x8086	0x1043	"ipw2100"	"Intel Corp.|PRO/Wireless LAN 2100 3B Mini PCI Adapter"
 0x8086	0x1048	"ixgb"	"Intel Corp.|82597EX 10 Gigabit Ethernet Controller"
+0x8086	0x104b	"unknown"	"Intel Corp.|82566DM Nineveh Gigabit Ethernet Controller"
 0x8086	0x104f	"ipw2200"	"Intel Corp.|Wireless adapter"
 0x8086	0x1050	"e100"	"Intel Corp.|82801EB (ICH5) PRO/100 VE Ethernet Controller"
 0x8086	0x1051	"e100"	"Intel Corp.|82801EB (ICH5) PRO/100 VE Ethernet Controller"
@@ -6107,14 +6135,16 @@
 0x8086	0x108a	"e1000"	"Intel Corporation|82546EB Gigabit Ethernet Controller"
 0x8086	0x108b	"e1000"	"Intel Corporation|82573V Gigabit Ethernet Controller"
 0x8086	0x108c	"e1000"	"Intel Corporation|82573E Gigabit Ethernet Controller"
+0x8086	0x108e	"unknown"	"Intel Corporation|82573E KCS"
+0x8086	0x108f	"unknown"	"Intel Corporation|Intel(R) Active Management Technology - SOL"
 0x8086	0x1091	"e100"	""
 0x8086	0x1092	"e100"	""
 0x8086	0x1093	"e100"	""
 0x8086	0x1094	"e100"	""
 0x8086	0x1095	"e100"	""
-0x8086	0x1096	"unknown"	"Intel Corporation|Enterprise Southbridge DPT LAN Copper"
+0x8086	0x1096	"e1000"	"Intel Corporation|Enterprise Southbridge DPT LAN Copper"
 0x8086	0x1097	"unknown"	"Intel Corporation|Enterprise Southbridge DPT LAN fiber"
-0x8086	0x1098	"unknown"	"Intel Corporation|Enterprise Southbridge DPT LAN SERDES"
+0x8086	0x1098	"e1000"	"Intel Corporation|Enterprise Southbridge DPT LAN SERDES"
 0x8086	0x1099	"e1000"	"Intel Corporation|82546GB Gigabit Ethernet Controller"
 0x8086	0x109a	"unknown"	"Intel Corporation|82573L Gigabit Ethernet Controller"
 0x8086	0x10c6	"megaraid"	"Intel Corporation|MegaRAID 438"
@@ -6532,6 +6562,8 @@
 0x8086	0x25e7	"unknown"	"Intel Corporation|Server PCI Express x4 Port 7"
 0x8086	0x25e8	"unknown"	"Intel Corporation|Server AMB Memory Mapped Registers"
 0x8086	0x25f0	"unknown"	"Intel Corporation|Server Error Reporting Registers"
+0x8086	0x25f1	"unknown"	"Intel Corporation|Reserved Registers"
+0x8086	0x25f3	"unknown"	"Intel Corporation|Reserved Registers"
 0x8086	0x25f5	"unknown"	"Intel Corporation|Server FBD Registers"
 0x8086	0x25f6	"unknown"	"Intel Corporation|Server FBD Registers"
 0x8086	0x25f7	"unknown"	"Intel Corporation|Server PCI Express x8 Port 2-3"
@@ -6591,9 +6623,11 @@
 0x8086	0x2668	"snd-hda-intel"	"Intel Corp.|I/O Controller Hub Audio"
 0x8086	0x266a	"i2c-i801"	"Intel Corp.|I/O Controller Hub SMBus"
 0x8086	0x266c	"unknown"	"Intel Corp.|82801FB/FBM/FR/FW/FRW (ICH6 Family) LAN Controller"
+0x8086	0x266d	0x1014	0x0574	"Hsf:www.linmodems.org"	"Intel Corp.|I/OController Hub Modem"
 0x8086	0x266d	0x103c	0x0934	"slamr"	"Intel Corp.|I/OController Hub Modem"
 0x8086	0x266d	0x103c	0x0944	"slamr"	"Intel Corp.|I/OController Hub Modem"
 0x8086	0x266d	0x103c	0x099c	"slamr"	"Intel Corp.|I/OController Hub Modem"
+0x8086	0x266d	0x14c0	0x0012	"slamr"	"Intel Corp.|I/OController Hub Modem"
 0x8086	0x266d	0x14f1	0x5423	"Hsf:www.linmodems.org"	"Intel Corp.|I/OController Hub Modem"
 0x8086	0x266d	0x17c0	0x10ab	"slamr"	"Intel Corp.|I/OController Hub Modem"
 0x8086	0x266d	"snd-intel8x0m"	"Intel Corp.|I/O Controller Hub Modem"
@@ -6630,9 +6664,9 @@
 0x8086	0x277d	"unknown"	"Intel Corporation|PCI Express Graphics Port"
 0x8086	0x2782	"unknown"	"Intel Corp.|Graphics Controller"
 0x8086	0x2792	"unknown"	"Intel Corp.|Mobile Graphics Controller"
-0x8086	0x27a0	"unknown"	"Intel Corporation|Mobile Memory Controller Hub"
+0x8086	0x27a0	"intel-agp"	"Intel Corporation|Mobile Memory Controller Hub"
 0x8086	0x27a1	"unknown"	"Intel Corporation|Mobile PCI Express Graphics Port"
-0x8086	0x27a2	"unknown"	"Intel Corporation|Mobile Integrated Graphics Controller"
+0x8086	0x27a2	"Card:Intel 945"	"Intel Corporation|Mobile Integrated Graphics Controller"
 0x8086	0x27a6	"unknown"	"Intel Corporation|Mobile Integrated Graphics Controller"
 0x8086	0x27b0	"unknown"	"Intel Corporation|I/O Controller Hub LPC"
 0x8086	0x27b1	"i810-tco"	"Intel Corporation|Mobile I/O Controller Hub LPC"
@@ -6663,7 +6697,37 @@
 0x8086	0x27df	"piix"	"Intel Corporation|I/O Controller Hub PATA"
 0x8086	0x27e0	"unknown"	"Intel Corporation|I/O Controller Hub PCI Express Port 5"
 0x8086	0x27e2	"unknown"	"Intel Corporation|I/O Controller Hub PCI Express Port 6"
-0x8086	0x2982	"Card:Intel 915"	""
+0x8086	0x2810	"unknown"	"Intel Corporation|LPC Interface Controller"
+0x8086	0x2811	"unknown"	"Intel Corporation|Mobile LPC Interface Controller"
+0x8086	0x2812	"unknown"	"Intel Corporation|LPC Interface Controller"
+0x8086	0x2814	"unknown"	"Intel Corporation|LPC Interface Controller"
+0x8086	0x2815	"unknown"	"Intel Corporation|Mobile LPC Interface Controller"
+0x8086	0x2820	"ata_piix"	"Intel Corporation|SATA Controller 1 cc=IDE"
+0x8086	0x2821	"ahci"	"Intel Corporation|SATA Controller cc=AHCI"
+0x8086	0x2822	"ahci"	"Intel Corporation|SATA Controller cc=RAID"
+0x8086	0x2824	"ahci"	"Intel Corporation|SATA Controller cc=AHCI"
+0x8086	0x2825	"ata_piix"	"Intel Corporation|SATA Controller 2 cc=IDE"
+0x8086	0x2828	"ata_piix"	"Intel Corporation|Mobile SATA Controller cc=IDE"
+0x8086	0x2829	"ahci"	"Intel Corporation|Mobile SATA Controller cc=AHCI"
+0x8086	0x282a	"ahci"	"Intel Corporation|Mobile SATA Controller cc=RAID"
+0x8086	0x2830	"unknown"	"Intel Corporation|USB UHCI Controller #1"
+0x8086	0x2831	"unknown"	"Intel Corporation|USB UHCI Controller #2"
+0x8086	0x2832	"unknown"	"Intel Corporation|USB UHCI Controller #3"
+0x8086	0x2834	"unknown"	"Intel Corporation|USB UHCI Controller #4"
+0x8086	0x2835	"unknown"	"Intel Corporation|USB UHCI Controller #5"
+0x8086	0x2836	"unknown"	"Intel Corporation|USB2 EHCI Controller #1"
+0x8086	0x283a	"unknown"	"Intel Corporation|USB2 EHCI Controller #2"
+0x8086	0x283e	"i2c-i801"	"Intel Corporation|SMBus Controller"
+0x8086	0x283f	"unknown"	"Intel Corporation|PCI Express Port 1"
+0x8086	0x2841	"unknown"	"Intel Corporation|PCI Express Port 2"
+0x8086	0x2843	"unknown"	"Intel Corporation|PCI Express Port 3"
+0x8086	0x2844	"unknown"	"Intel Corporation|PCI Express Port 4"
+0x8086	0x2847	"unknown"	"Intel Corporation|PCI Express Port 5"
+0x8086	0x2849	"unknown"	"Intel Corporation|PCI Express Port 6"
+0x8086	0x284b	"snd-hda-intel"	"Intel Corp.|ICH8 HD Audio DID"
+0x8086	0x284f	"unknown"	"Intel Corporation|Thermal Subsystem"
+0x8086	0x2850	"piix"	"Intel Corporation|Mobile IDE Controller"
+0x8086	0x2982	"Card:Intel 915"	"Intel Corp.|i915 Graphics Controller"
 0x8086	0x3092	"i2o_block"	"Intel Corp.|Integrated RAID"
 0x8086	0x3200	"sata_vsc"	"Intel Corp.|31244 PCI-X to Serial ATA Controller"
 0x8086	0x3340	"intel-agp"	"Intel Corp.|82855PM Processor to I/O Controller"
@@ -6708,8 +6772,10 @@
 0x8086	0x4000	"unknown"	"Intel Corp.|Creatix V.90 HaM Modem"
 0x8086	0x4220	"ipw2200"	"Intel Corp.|Intel(R) PRO/Wireless 2200BG"
 0x8086	0x4221	"ipw2200"	"Intel Corp.|Intel(R) PRO/Wireless 2225BG"
+0x8086	0x4222	"ipw3945"	"Intel Corp.|Intel(R) PRO/Wireless 3945ABG"
 0x8086	0x4223	"ipw2200"	"Intel Corp.|PRO/Wireless 2915ABG MiniPCI Adapter"
 0x8086	0x4224	"ipw2200"	"Intel Corp.|PRO/Wireless 2915ABG MiniPCI Adapter"
+0x8086	0x4227	"ipw3945"	"Intel Corp.|Intel(R) PRO/Wireless 3945ABG"
 0x8086	0x5001	"unknown"	"Intel Corp.|PRO/DSL 2100 Modem - PPP"
 0x8086	0x5005	"unknown"	"Intel Corp.|PRO/DSL 2200 Modem - PPPoA"
 0x8086	0x5200	"eepro100"	"Intel Corp.|EtherExpress PRO/100"