This commit was manufactured by cvs2svn to create tag 'V0_1_9_30mdk'.V0_1_9_30mdk

7 files changed, 2454 insertions, 1421 deletions

diff --git a/ChangeLog b/ChangeLog
index 1bc8b589..65eca240 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,605 @@
+2006-03-10 13:06  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec, lst/pcitable: MCP51 ids
+
+2006-02-10 13:04  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec: 0.1.9-29mdk
+
+2006-02-10 13:04  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: recognize ATI RS480 chipsets
+
+2006-02-10 13:04  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: recognize ATI RS480 chipsets
+
+2006-02-09 09:28  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec: 0.1.9-28mdk
+
+2006-02-09 09:28  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: better nforce 4 descriptions
+
+2006-02-09 09:28  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: better nforce 4 descriptions
+
+2006-02-09 09:16  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: - recognize Quadro FX 1400 (0x10de 0x00ce) - use
+	  forcedeth_ng (0x10de 0x00057) for nForce 4 (HP xw9300)
+
+2006-02-08 09:23  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable.ppc64: use "lpfc" for ppc64 branch
+
+2006-02-08 09:15  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: one more ipr device and make make check happy
+
+2006-02-08 09:07  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec: 0.1.9-27mdk
+
+2006-02-08 09:00  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: ids for forcedeth_ng (forcedeth 0.28)
+
+2006-01-04 12:02  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec: 0.1.9-26mdk
+
+2006-01-04 12:01  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* lst/pcitable: - add support for PDC20275 EIDE Controller
+	  ("pdc202xx_new") - add support for IBM Dual Channel PCI-X DDR
+	  U320 SCSI Adapters ("ipr")
+
+2006-01-04 11:43  Gwenole Beauchesne <gbeauchesne at mandriva.com>
+
+	* ldetect-lst.spec, lst/pcitable: add support for ATI SB400
+	  (sata_sil) and new BCM575x chipsets (tg3_ng)
+
+2004-12-16 11:00  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* lst/pcitable: fix sound and network on QA box with corporate
+	  server
+
+2004-11-26 19:21  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* convert/merge2pcitable.pl: rollback bad commit
+
+2004-11-26 19:19  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: handle devices which drivers declare them with
+	  PCI_ANY_ID
+
+2004-11-26 19:18  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* convert/merge2pcitable.pl: backport: handle devices which drivers
+	  declare them with PCI_ANY_ID
+
+2004-11-26 14:38  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.9-23mdk
+
+2004-11-26 14:37  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: backport: according to
+	  drivers/pcmcia/yenta_socket.c::yenta_table, all devices which
+	  vendor are managed by yenta_socket
+
+2004-11-08 14:06  Frederic Lepied <flepied@mandrakesoft.com>
+
+	* lst/pcitable: merged more entries from 10.1 with inputs from
+	  Gwenole
+
+2004-11-08 13:34  Frederic Lepied <flepied@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.9-22mdk
+
+2004-11-08 13:33  Frederic Lepied <flepied@mandrakesoft.com>
+
+	* lst/: Cards+, pcitable: merged with HEAD branch
+
+2004-11-05 15:59  Frederic Lepied <flepied@mandrakesoft.com>
+
+	* lst/usbtable: added some smartcard readers
+
+2004-10-28 09:59  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* lst/pcitable: Quadro FX 1100
+
+2004-10-27 18:34  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.9-20mdk
+
+2004-10-27 18:31  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/usbtable: backport freebox support
+
+2004-10-27 18:30  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/usbtable: backport support for MGE UPSes
+
+2004-10-21 17:51  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.22-20mdk
+
+2004-10-21 17:50  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* lst/pcitable: add Quadro FX 3400 PCI-Express ID, fix typo for
+	  Quadro FX 1300
+
+2004-09-13 10:31  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.9-19mdk (merge relevant bits from HEAD)
+
+2004-09-13 09:59  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: use right qla driver
+
+2004-09-13 09:58  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: in 2.6.x kernel, pwcd was splited between pcwd_pci
+	  and pcwd_usb
+
+2004-09-13 09:58  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: pc300 replaced pc300too in both 2.4.x and 2.6.x
+	  kernels long time ago
+
+2004-09-13 09:58  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: this device has two PCI functions, one for video
+	  (tv) and one for audio.
+
+	  since most people listen to audio through a jack between their tv
+	  card and their sound card rather than using btaudio or snd-bt87x,
+	  it's more important to support their tv/satellite card rather
+	  than just sound
+
+2004-09-13 09:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: according to kernel pcimap, yenta_socket does not
+	  register this device whereas i82092 does
+
+2004-09-13 09:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: 3c359 replaced 3c559 in both 2.4.x and 2.6.x
+	  kernels
+
+2004-09-13 09:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: donauboe replaced toshoboe
+
+2004-09-13 09:56  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: do one s/tulip/de2104x/ (according to kernel
+	  pcimap, this device is only registred with de2104x)
+
+2004-09-13 09:55  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: hw_random replaced both amd7xx_tco, amd768_rng and
+	  i810_rng in both 2.4.x and 2.6.x kernels
+
+2004-09-13 09:54  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: tmspci replaced sktr long time ago
+
+=======
+2004-11-08 14:06  Frederic Lepied <flepied@mandrakesoft.com>
+
+	* lst/pcitable: merged more entries from 10.1 with inputs from
+	  Gwenole
+
+2004-11-08 13:34  Frederic Lepied <flepied@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.9-22mdk
+
+2004-11-08 13:33  Frederic Lepied <flepied@mandrakesoft.com>
+
+	* lst/: Cards+, pcitable: merged with HEAD branch
+
+2004-11-05 15:59  Frederic Lepied <flepied@mandrakesoft.com>
+
+	* lst/usbtable: added some smartcard readers
+
+2004-10-28 09:59  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* lst/pcitable: Quadro FX 1100
+
+2004-10-27 18:34  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.9-20mdk
+
+2004-10-27 18:31  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/usbtable: backport freebox support
+
+2004-10-27 18:30  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/usbtable: backport support for MGE UPSes
+
+2004-10-21 17:51  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.22-20mdk
+
+2004-10-21 17:50  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* lst/pcitable: add Quadro FX 3400 PCI-Express ID, fix typo for
+	  Quadro FX 1300
+
+2004-10-21 11:50  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* lst/pcitable: add Quadro FX 3400 PCI-Express ID, fix typo for
+	  Quadro FX 1300
+
+2004-09-13 09:59  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: use right qla driver
+
+2004-09-13 09:58  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: in 2.6.x kernel, pwcd was splited between pcwd_pci
+	  and pcwd_usb
+
+2004-09-13 09:58  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: pc300 replaced pc300too in both 2.4.x and 2.6.x
+	  kernels long time ago
+
+2004-09-13 09:58  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: this device has two PCI functions, one for video
+	  (tv) and one for audio.
+
+	  since most people listen to audio through a jack between their tv
+	  card and their sound card rather than using btaudio or snd-bt87x,
+	  it's more important to support their tv/satellite card rather
+	  than just sound
+
+2004-09-13 09:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: according to kernel pcimap, yenta_socket does not
+	  register this device whereas i82092 does
+
+2004-09-13 09:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: 3c359 replaced 3c559 in both 2.4.x and 2.6.x
+	  kernels
+
+2004-09-13 09:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: donauboe replaced toshoboe
+
+2004-09-13 09:56  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: do one s/tulip/de2104x/ (according to kernel
+	  pcimap, this device is only registred with de2104x)
+
+2004-09-13 09:55  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: hw_random replaced both amd7xx_tco, amd768_rng and
+	  i810_rng in both 2.4.x and 2.6.x kernels
+
+2004-09-13 09:54  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: tmspci replaced sktr long time ago
+
+>>>>>>> 1.74.2.8
+2004-09-06 06:09  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* Makefile: (changelog) only follow MDK10_0-branch
+
+2004-09-06 04:49  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* ldetect-lst.spec, lst/pcitable: - Add nVidia GeForce FX 5750
+	  PCI-Express - Add some new nForce 3 ethernet chipsets
+	  (forcedeth?)
+
+2004-08-30 07:33  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.9-17mdk
+
+2004-08-30 07:26  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* lst/pcitable: Adapt for 3ware 9000-series controllers
+
+2004-08-26 06:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: switch Intel/ICH6 sound card from OSS to ALSA b/c
+	  of sound recording issues
+
+2004-08-18 22:55  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/usbtable: sync with kernel-2.6.8.1.1mdk
+
+2004-08-18 05:40  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.15-1mdk
+
+2004-08-18 05:20  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: merge with kernel-2.6.8.1.1mdk
+
+2004-08-17 01:55  Erwan Velu <erwan@mandrakesoft.com>
+
+	* lst/pcitable: updating nvidia fixing empty strings
+
+2004-08-17 01:15  Gregory Letoquart <gletoquart@mandrakesoft.com>
+
+	* lst/pcitable: ADD ATI X800 Pro Graphic Card
+
+2004-08-17 00:56  Gregory Letoquart <gletoquart@mandrakesoft.com>
+
+	* lst/Cards+: ADD New NVIDIA 6800 Card Model
+
+2004-08-17 00:55  Gregory Letoquart <gletoquart@mandrakesoft.com>
+
+	* lst/pcitable: ADD New Graphic Card NVIDIA 6800GT
+
+2004-08-16 21:56  Gregory Letoquart <gletoquart@mandrakesoft.com>
+
+	* lst/pcitable: ADD X600 Pro card
+
+2004-08-04 01:41  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.14-1mdk
+
+2004-08-04 00:55  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/usbtable: merge strings from usb.ids
+
+2004-08-04 00:55  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* convert/README.pcitable: fix doc
+
+2004-08-04 00:50  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/usbtable: sync usbtable with with kernel-2.6.8-0.rc2.2mdk
+
+2004-08-03 08:02  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.13-1mdk
+
+2004-08-03 07:44  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: update 58 northbridge description from pci.ids
+
+2004-08-03 07:41  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: merge with pci.ids from 2004-08-02
+
+2004-08-03 07:40  Pixel <pixel@mandrakesoft.com>
+
+	* convert/merge2pcitable.pl: do it a little more cleanly
+
+2004-08-03 07:27  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: more merge with kernel-2.6.8-0.rc2.2mdk
+
+2004-08-03 07:21  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* Makefile: add log alias on changelog target
+
+2004-08-03 07:20  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: sync with pci.ids (unfound by old
+	  merge2pcitable.pl)
+
+2004-08-03 07:20  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* convert/merge2pcitable.pl: import missing description later
+
+2004-08-03 07:14  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* convert/merge2pcitable.pl: do not vivicate new devices (will look
+	  later why merge2pcitable.pl does not find new devices from
+	  pci.ids)
+
+2004-08-03 07:11  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* convert/merge2pcitable.pl: get descriptions back from pci.ids if
+	  needed
+
+2004-08-03 07:09  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: one more string from pci.ids
+
+2004-08-03 07:01  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: fix duplicates
+
+2004-08-03 06:58  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: add missing strings from pci.ids
+
+2004-08-03 06:09  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: merge with kernel-2.6.8-0.rc2.2mdk
+
+2004-08-03 06:02  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: merge with pciids.sf.net
+
+2004-08-03 05:17  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: merge with pciids.sf.net
+
+2004-07-28 19:44  Frederic Lepied <flepied@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.12-1mdk
+
+2004-07-28 11:21  Frederic Lepied <flepied@mandrakesoft.com>
+
+	* lst/usbtable: updated description
+
+2004-07-26 08:33  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* ldetect-lst.spec: fix 0.1.10-1mdk 's changelog :-(
+
+2004-07-26 00:12  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.11-1mdk
+
+2004-07-26 00:06  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/MonitorsDB: increase DELL monitors frequency ranges (from
+	  hwdata-0.123)
+
+2004-07-26 00:05  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/MonitorsDB: sync case with hwdata-0.123
+
+2004-07-26 00:02  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/MonitorsDB: two new HP monitors
+
+2004-07-26 00:00  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/MonitorsDB: introduce alternate EISA ids
+
+2004-07-25 23:59  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/MonitorsDB: typo fix
+
+2004-07-25 23:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/MonitorsDB: fix sorting
+
+2004-07-25 23:56  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/MonitorsDB: remove a few dobles intruced by pixel
+
+2004-07-25 23:50  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/MonitorsDB: sync with rh's hwdata-0.123
+
+2004-07-21 04:43  Nicolas Planel <nplanel@mandrakesoft.com>
+
+	* lst/pcitable: bcm4400 -> b44	like (#9742)
+
+2004-07-21 04:42  Nicolas Planel <nplanel@mandrakesoft.com>
+
+	* lst/pcitable: bcm5700 -> tg3 (#9742)
+
+2004-07-07 04:10  Gregory Letoquart <gletoquart@mandrakesoft.com>
+
+	* lst/pcitable: Add NVIDIA PCI-express 5750 Card Add Matrox P750
+	  Add NVIDIA GO 5600
+
+2004-07-06 21:07  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/MonitorsDB: add a Princeton monitor (#2633)
+
+2004-07-06 21:06  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/MonitorsDB: add a LCD monitor (Sylvain Vignaud)
+
+2004-06-22 04:29  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: fix #8295 (no ADSL over this card)
+
+2004-06-15 09:25  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.10-1mdk
+
+2004-06-15 09:23  Arnaud de Lorbeau <adelorbeau@mandrakesoft.com>
+
+	* lst/pcitable: Add madwifi_pci for 16c8 0013 and slamr (slmodem)
+	  for 10b9 5457
+
+2004-06-15 09:13  Arnaud de Lorbeau <adelorbeau@mandrakesoft.com>
+
+	* lst/pcitable: Modification of some bcm5700 in tg3 and add a few
+	  chip names.
+
+2004-06-08 13:35  Arnaud de Lorbeau <adelorbeau@mandrakesoft.com>
+
+	* lst/pcitable: Add some cardbus controleur from
+	  pciids.sourceforge.net Add module yenta_socket for the 0x1217
+	  0x7114 (tested)
+
+2004-06-08 12:14  Arnaud de Lorbeau <adelorbeau@mandrakesoft.com>
+
+	* lst/pcitable: CB1410 Cardbus Controller works with yenta_socket
+
+2004-06-08 09:14  Erwan Velu <erwan@mandrakesoft.com>
+
+	* lst/pcitable: adding usb modules for dell PE750
+
+2004-05-27 04:46  Pixel <pixel@mandrakesoft.com>
+
+	* lst/: Cards+, pcitable: rename "NeoMagic (laptop/notebook)" to
+	  "NeoMagic MagicGraph (laptop/notebook)" (cosmetic change)
+	  (bugzilla #4686)
+
+2004-05-24 17:02  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* Makefile: err file no longer exists
+
+2004-05-24 17:02  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* Makefile: err file no longer exists
+
+2004-05-24 17:01  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* lst/pcitable: Add Quadro FX 1300 entries, fix Erwan changes
+
+2004-05-12 12:11  Erwan Velu <erwan@mandrakesoft.com>
+
+	* lst/pcitable: Adding some aacraid missing entries
+
+2004-05-11 14:58  Erwan Velu <erwan@mandrakesoft.com>
+
+	* lst/pcitable: Updating cciss & cpqarray pci ids
+
+2004-05-10 13:21  Nicolas Planel <nplanel@mandrakesoft.com>
+
+	* lst/pcitable: fix module loading initio -> a100u2w
+
+2004-05-03 18:03  Pixel <pixel@mandrakesoft.com>
+
+	* ldetect-lst.spec, lst/pcitable: pcitable: remove the few
+	  remaining "Server:SVGA" since we don't have XF3 anymore
+
+2004-05-03 16:44  Pixel <pixel@mandrakesoft.com>
+
+	* ldetect-lst.spec, lst/Cards+: Cards+: drop XFree3 related data
+
+2004-04-26 17:38  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* ldetect-lst.spec: 0.1.9-15mdk
+
+2004-04-26 17:35  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* lst/pcitable: Revert GeForce FX 5700 change, XFree86 4.3 "nv"
+	  driver does not get it right
+
+2004-04-26 17:29  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+	* lst/MonitorsDB: Add Tatung C7BZR monitor specs
+
+2004-04-20 14:09  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: sync with kernel-2.6.3-10mdk
+
+2004-04-20 11:51  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: sync with rh's wdata-0.117 (add support for 4
+	  geforce cards and fix one sound card)
+
+2004-04-20 11:46  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: roll back bogus commit
+
+2004-04-20 11:36  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* lst/pcitable: sync with kernel-2.6.3-9mdk
+
 2004-04-16 17:36  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
 
 	* ldetect-lst.spec: 0.1.9-14mdk
diff --git a/Makefile b/Makefile
index 19cfe437..7fff60c8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ VERSION := $(shell rpm -q --qf '%{VERSION}\n' --specfile $(PACKAGE).spec | head
 RELEASE := $(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec | head -1)
 TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
 
-FILES = AUTHORS ChangeLog Makefile Makefile.config convert err ldetect-lst.spec lst update-ldetect-lst
+FILES = AUTHORS ChangeLog Makefile Makefile.config convert ldetect-lst.spec lst update-ldetect-lst
 
 build: 
 	make -C lst build
@@ -65,7 +65,7 @@ cvstag:
 	cvs tag $(CVSTAGOPT) $(TAG)
 
 changelog: ../common/username
-	cvs2cl -U ../common/username -I ChangeLog --accum
+	cvs2cl -U ../common/username -I ChangeLog --accum -F MDK10_0-branch
 	rm -f ChangeLog.bak
 	cvs commit -m "Generated by cvs2cl the `date '+%d_%b'`" ChangeLog
 
diff --git a/ldetect-lst.spec b/ldetect-lst.spec
index 566b32a0..89c1d21e 100644
--- a/ldetect-lst.spec
+++ b/ldetect-lst.spec
@@ -1,6 +1,6 @@
 %define name ldetect-lst
 %define version 0.1.9
-%define release 14mdk
+%define release 30mdk
 
 Name: %{name}
 Version: %{version}
@@ -64,6 +64,76 @@ fi
 %{_bindir}/*
 
 %changelog
+* Fri Mar 10 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.1.9-30mdk
+- more nForce4 ids (mainly for MCP51)
+
+* Fri Feb 10 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.1.9-29mdk
+- recognize ATI RS480 chipsets
+
+* Thu Feb  9 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.1.9-28mdk
+- recognize Quadro FX 1400
+- recognize nForce 4 NICs (HP xw9300), make them use "forcedeth_ng"
+
+* Wed Feb  8 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.1.9-27mdk
+- add support for newer nForce NICs ("forcedeth_ng")
+
+* Wed Jan  4 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.1.9-26mdk
+- add support for PDC20275 EIDE Controller ("pdc202xx_new")
+- add support for IBM Dual Channel PCI-X DDR U320 SCSI Adapters ("ipr")
+
+* Wed Apr 20 2005 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.1.9-25mdk
+- add support for ATI RS480 chipsets
+- add support for BCM 575X NICs as tg3_ng
+
+* Fri Nov 26 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 0.1.9-24mdk
+- add support for a couple of Adaptec SCSI controllers
+
+* Fri Nov 26 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 0.1.9-23mdk
+- fix PCMCIA on O2 Micro controllers
+
+* Mon Nov  8 2004 Frederic Lepied <flepied@mandrakesoft.com> 0.1.9-22mdk
+- merged with 10.1 branch
+
+* Wed Oct 27 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 0.1.9-21mdk
+- freebox support
+- support for MGE UPSes
+
+* Thu Oct 21 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.1.9-20mdk
+- add Quadro FX 3400 PCI-Express ID
+
+* Mon Sep 13 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 0.1.9-19mdk
+- pcitable:
+  o in 2.6.x kernel, pwcd was splited between pcwd_pci and pcwd_usb
+  o in both 2.4.x and 2.6.x kernels:
+    * 3c359 replaced 3c559
+    * donauboe replaced toshoboe
+    * hw_random replaced both amd7xx_tco, amd768_rng and i810_rngb
+    * pc300 replaced pc300too
+    * tmspci replaced sktr
+  o fix a few wrong entries (according to kernel's pcimap):
+    * one s/qla2200/qla2100/
+    * one s/tulip/de2104x/
+    * one s/yenta_socket/i82092/
+
+* Mon Sep  6 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.1.9-18mdk
+- Add nVidia GeForce FX 5750 PCI-Express
+
+* Mon Aug 30 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.1.9-17mdk
+- Add 3w-9xxx for 3ware 9000-series controllers
+
+* Mon May 24 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.1.9-16mdk
+- Add Quadro FX 1300 entry
+- Fix module loading initio -> a100u2w (nicolas)
+- Updating cciss & cpqarray pci ids (erwan)
+- Adding some aacraid missing entries (erwan)
+- pcitable: remove the few remaining "Server:SVGA" since we don't have XF3 anymore (Pixel)
+- Cards+: drop XFree3 related data (Pixel)
+
+* Mon Apr 26 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.1.9-15mdk
+- add Tatung C7BZR monitor specs
+- revert GeForce FX 5700 change as XFree86 4.3 "nv" driver doesn't get it right
+- sync with kernel-2.6.3-10mdk and rh's hwdata-0.117 (tv)
+
 * Fri Apr 16 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.1.9-14mdk
 - add "iteraid" (IT8212) controller
 - fix GeForce FX 5700/5950, Quadro FX 1100 entries
diff --git a/lst/Cards+ b/lst/Cards+
index 46cdad8e..ba6fa670 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -2,7 +2,7 @@
 # This is the database of card definitions used by XFdrake
 #
 
-# Each definition should have a NAME entry, a SERVER or DRIVER
+# Each definition should have a NAME entry, a DRIVER
 #
 # A reference to another definition is made with SEE (already defined
 # entries are not overridden).
@@ -14,12 +14,9 @@
 # LINE: adds a line of text to be included in the Device section (can include options or comments).
 #
 # DRI_GLX: 3D acceleration configuration for XFree 4 using DRI.
-# UTAH_GLX: 3D acceleration configuration for XFree 3.3 using Utah-GLX.
 # DRI_GLX_EXPERIMENTAL: DRI, but EXPERIMENTAL and may freeze the machine.
-# UTAH_GLX_EXPERIMENTAL: Utah-GLX, but EXPERIMENTAL and may freeze the machine.
 #
 # BAD_FB_RESTORE: for bad cards not restoring cleanly framebuffer (XFree 4)
-# BAD_FB_RESTORE_XF3: for bad cards not restoring cleanly framebuffer (XFree 3)
 #
 # MULTI_HEAD 2: for DualHead cards (think Matrox G450)
 # MULTI_HEAD n: for n Head cards (eg: "MULTI_HEAD 4" for QuadHead)
@@ -31,7 +28,6 @@
 
 #untested
 NAME Chips & Technologies CT65520
-SERVER SVGA
 DRIVER chips
 LINE # Device section for C&T cards.
 LINE # Option "suspend_hack"
@@ -105,13 +101,11 @@ NAME Chips & Technologies CT69030
 SEE Chips & Technologies CT65550
 
 NAME Chips & Technologies CT64200
-SERVER SVGA
 DRIVER chips
 LINE # Device section for C&T cards.
 LINE # videoram 1024
 
 NAME Chips & Technologies CT64300
-SERVER SVGA
 DRIVER chips
 LINE # Option "noaccel"
 LINE # Option "no_bitblt"
@@ -128,7 +122,6 @@ SEE Chips & Technologies CT64200
 
 #tested
 NAME Cirrus Logic GD542x
-SERVER SVGA
 DRIVER vga
 LINE # Device section for Cirrus Logic GD5420/2/4/6/8/9-based cards.
 LINE     #MemBase 0x00e00000
@@ -137,7 +130,6 @@ LINE     #Option "linear"
 
 #tested
 NAME Cirrus Logic GD543x
-SERVER SVGA
 DRIVER cirrus
 LINE # Device section for Cirrus Logic GD5430/34-based cards.
 LINE     #MemBase 0x00e00000		# ISA card that maps to 14Mb
@@ -147,7 +139,6 @@ LINE     #MemBase 0x02000000		# VLB card that maps to 32Mb
 LINE     #Option "linear"
 
 NAME Cirrus Logic GD544x
-SERVER SVGA
 DRIVER cirrus
 
 NAME Creative Labs Graphics Blaster MA201
@@ -158,19 +149,16 @@ SEE Cirrus Logic GD544x
 
 #tested
 NAME Cirrus Logic GD5462
-SERVER SVGA
 DRIVER cirrus
 LINE #Option "fifo_conservative"
 
 #tested
 NAME Cirrus Logic GD5464
-SERVER SVGA
 DRIVER cirrus
 LINE #Option "fifo_conservative"
 
 #tested
 NAME Cirrus Logic GD5465
-SERVER SVGA
 DRIVER cirrus
 LINE #Option "fifo_conservative"
 
@@ -186,7 +174,6 @@ SEE Cirrus Logic GD5464
 # reported not working on SGI 1200 as of 02/22/2001 (RH)
 # reported working on XF 4.2.0 by Juan (MDK)
 NAME Cirrus Logic GD5480
-SERVER SVGA
 DRIVER cirrus
 
 #tested
@@ -203,7 +190,6 @@ NAME Diamond SpeedStar Pro 1100
 SEE Cirrus Logic GD542x
 
 NAME Orchid Kelvin 64 VLB Rev A
-SERVER SVGA
 DRIVER cirrus
 LINE # Device section for Orchid Kelvin 64 VLB Rev A
 LINE # Linear framebuffer maps at 2048Mb. Some motherboards make linear addressing
@@ -214,7 +200,6 @@ LINE     MemBase 0x80000000		# VLB card that maps to 2048Mb
 LINE     #Option "linear"
 
 NAME Orchid Kelvin 64 VLB Rev B
-SERVER SVGA
 DRIVER cirrus
 LINE # Device section for Orchid Kelvin 64 VLB Rev B
 LINE # Linear framebuffer maps at 32Mb. Some motherboards make linear addressing
@@ -262,15 +247,12 @@ NAME VI720
 SEE Cirrus Logic GD543x
 
 NAME Cirrus Logic GD62xx (laptop)
-SERVER SVGA
 DRIVER vga
 
 NAME Cirrus Logic GD64xx (laptop)
-SERVER SVGA
 DRIVER vga
 
 NAME Cirrus Logic GD754x (laptop)
-SERVER SVGA
 DRIVER vga
 
 NAME Techworks Ultimate 3D
@@ -283,12 +265,10 @@ NAME Jaton Video-70P
 SEE Cirrus Logic GD5464
 
 NAME PixelView Combo TV Pro (Prolink)
-SERVER SVGA
 DRIVER vga
 LINE # COMMENT on card TV Tuner
 
 NAME PixelView Combo TV 3D AGP (Prolink)
-SERVER SVGA
 DRIVER vga
 LINE # COMMENT on card TV+FM Tuner
 
@@ -299,13 +279,11 @@ NAME VideoLogic GrafixStar 560 (PCI/AGP)
 SEE Cirrus Logic GD5465
 
 NAME Cirrus Logic GD5446 (noname card)
-SERVER SVGA
 DRIVER vga
 
 # S3 801/805
 
 NAME S3 801/805 (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -316,7 +294,6 @@ NAME S3 86C805 (generic)
 SEE S3 801/805 (generic)
 
 NAME Orchid Fahrenheit 1280
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Probable clocks:
@@ -332,7 +309,6 @@ SEE S3 801/805 (generic)
 # S3 864/Trio64/Trio32/868
 
 NAME S3 864 (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -343,7 +319,6 @@ NAME S3 Vision864 (generic)
 SEE S3 864 (generic)
 
 NAME S3 868 (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -354,12 +329,10 @@ NAME S3 Vision868 (generic)
 SEE S3 868 (generic)
 
 NAME S3 868 with SDAC (86C716)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
 NAME S3 Trio64 (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -367,7 +340,6 @@ NAME S3 86C764 (Trio64)
 SEE S3 Trio64 (generic)
 
 NAME S3 Trio64V+ (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -375,7 +347,6 @@ NAME S3 86C765 (Trio64V+)
 SEE S3 Trio64V+ (generic)
 
 NAME S3 Trio32 (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -445,7 +416,6 @@ SEE S3 Trio64V+ (generic)
 # S3 Trio64V2
 
 NAME S3 Trio64V2 (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -468,7 +438,6 @@ SEE S3 Trio64V2/DX (generic)
 # S3 Aurora64V+
 
 NAME S3 Aurora64V+ (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     # Option "lcd_center"
@@ -493,7 +462,6 @@ SEE S3 Aurora64V+ (generic)
 # S3 964/968
 
 NAME S3 964 (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -561,65 +529,54 @@ LINE    #s3RefClk  16
 SEE S3 968 (generic)
 
 NAME Miro Crystal 80SV
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
 NAME Elsa Winner 2000PRO-2
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "ELSA_w2000pro"
 
 NAME Elsa Winner 2000PRO-4
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "ELSA_w2000pro"
 
 NAME Elsa Winner 2000PRO/X-2
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
 NAME Elsa Winner 2000PRO/X-4
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
 NAME Elsa Winner 2000PRO/X-8
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
 NAME Elsa Winner 2000AVI
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
 NAME Elsa Gloria-4
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
 NAME Elsa Gloria-8
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
 NAME VideoLogic GrafixStar 700
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
 NAME Leadtek WinFast S430
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -627,7 +584,6 @@ NAME WinFast S430
 SEE Leadtek WinFast S430
 
 NAME Leadtek WinFast S510
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -637,7 +593,6 @@ SEE Leadtek WinFast S510
 # S3 928
 
 NAME S3 928 (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -645,7 +600,6 @@ NAME S3 86C928 (generic)
 SEE S3 928 (generic)
 
 NAME Elsa Winner 1000VL
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     # the following settings should be detected and set automatically by XF86_S3
@@ -665,7 +619,6 @@ SEE S3 928 (generic)
 # S3 911/924
 
 NAME S3 911/924 (generic)
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 
@@ -679,7 +632,6 @@ SEE S3 911/924 (generic)
 #SEE S3 911/924 (generic)
 
 NAME S3 924 with SC1148 DAC
-SERVER S3
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Probable clocks:
@@ -689,12 +641,10 @@ LINE     #Clocks 130.2 119.5 79.4 31.2 110.0 65.2 74.9 71.3
 # S3 ViRGE,/DX,/GX and ViRGE/VX
 
 NAME S3 ViRGE (old S3V server)
-SERVER S3V
 DRIVER s3virge
 NEEDVIDEORAM
 
 NAME S3 ViRGE (generic)
-SERVER SVGA
 DRIVER s3virge
 NEEDVIDEORAM
 LINE      #Option "xaa_benchmark"
@@ -703,7 +653,6 @@ LINE      #Option "pci_burst_on"
 LINE      #Option "pci_retry"
 
 NAME S3 ViRGE/DX (generic)
-SERVER SVGA
 DRIVER s3virge
 NEEDVIDEORAM
 LINE      #Option "xaa_benchmark"
@@ -712,7 +661,6 @@ LINE      #Option "pci_burst_on"
 LINE      #Option "pci_retry"
 
 NAME S3 ViRGE/GX (generic)
-SERVER SVGA
 DRIVER s3virge
 NEEDVIDEORAM
 LINE      #Option "xaa_benchmark"
@@ -722,7 +670,6 @@ LINE      #Option "pci_retry"
 
 
 NAME S3 ViRGE/GX2 (generic)
-SERVER SVGA
 DRIVER s3virge
 NEEDVIDEORAM
 LINE      #Option "xaa_benchmark"
@@ -731,7 +678,6 @@ LINE      #Option "pci_burst_on"
 LINE      #Option "pci_retry"
 
 NAME S3 ViRGE/MX (generic)
-SERVER SVGA
 DRIVER s3virge
 NEEDVIDEORAM
 LINE      #Option "lcd_center"
@@ -745,7 +691,6 @@ NAME S3 ViRGE/MX+ (generic)
 SEE S3 ViRGE/MX (generic)
 
 NAME S3 Trio3D
-SERVER SVGA
 DRIVER s3virge
 LINE Option "sw_cursor"
 
@@ -866,7 +811,6 @@ SEE S3 ViRGE (generic)
 
 
 NAME S3 ViRGE/VX (generic)
-SERVER SVGA
 DRIVER s3virge
 NEEDVIDEORAM
 LINE      #Option "xaa_benchmark"
@@ -933,7 +877,6 @@ SEE S3 ViRGE/MX (generic)
 
 
 NAME S3 Savage (generic)
-SERVER SVGA
 DRIVER savage
 NEEDVIDEORAM
 LINE      #Option "xaa_benchmark"
@@ -952,7 +895,6 @@ SEE S3 Savage (generic)
 
 NAME S3 Savage3D
 SEE S3 Savage (generic)
-UTAH_GLX_EXPERIMENTAL
 
 NAME Aristo ART-390-G  S3 Savage3D
 SEE S3 Savage (generic)
@@ -984,7 +926,6 @@ NAME Creative Labs Savage 4  3D Blaster
 SEE S3 Savage4 (generic)
 
 NAME S3 Savage2000 (generic)
-SERVER SVGA
 DRIVER savage
 NEEDVIDEORAM
 
@@ -994,22 +935,18 @@ SEE S3 Savage4 (generic)
 # ET4000/ET6000
 
 NAME ET3000 (generic)
-SERVER SVGA
 DRIVER tseng
 
 NAME Genoa 5400
 SEE ET3000 (generic)
 
 NAME ET4000 (generic)
-SERVER SVGA
 DRIVER tseng
 
 NAME ET4000/W32 (generic)
-SERVER W32
 DRIVER tseng
 
 NAME ET4000 W32i, W32p (generic)
-SERVER SVGA
 DRIVER tseng
 LINE     #Option "linear"       # for linear mode at 8bpp
 LINE     #Option "noaccel"      # when problems with accelerator
@@ -1022,7 +959,6 @@ LINE     #MemBase 0x3C00000     # when automatic MemBase detection doesn't work
 LINE         # -- see README.tseng for more (important) information on MemBase
 
 NAME ET6000 (generic)
-SERVER SVGA
 DRIVER tseng
 NEEDVIDEORAM
 LINE     #videoram 2304         # 2.25 MB, when memory probe is incorrect
@@ -1162,34 +1098,19 @@ SEE ET6000 (generic)
 # ATI
 
 NAME ATI 8514 Ultra (no VGA)
-SERVER Mach8
 DRIVER vga
 
 NAME ATI Graphics Ultra
-SERVER Mach8
 DRIVER vga
 
-NAME ATI Graphics Ultra Pro
-SERVER Mach32
-
 NAME ATI Wonder SVGA
-SERVER SVGA
 DRIVER ati
 
-NAME ATI Ultra Plus
-SERVER Mach32
-
-NAME ATI Mach32
-SERVER Mach32
-
 NAME ATI Mach64
-SERVER Mach64
 DRIVER ati
-BAD_FB_RESTORE_XF3
 
 NAME ATI Mach64 Utah
 SEE ATI Mach64
-UTAH_GLX_EXPERIMENTAL
 
 NAME ATI Mach64 CT (264CT)
 SEE ATI Mach64
@@ -1289,7 +1210,6 @@ SEE ATI Mach64
 
 NAME ATI Rage Mobility
 SEE ATI Mach64
-UTAH_GLX_EXPERIMENTAL
 BAD_FB_RESTORE
 
 NAME ATI Rage Mobility P
@@ -1302,7 +1222,6 @@ NAME ASUS PCI-AV264CT
 SEE ATI Mach64
 
 NAME ATI Rage XL
-SERVER SVGA
 DRIVER ati
 
 NAME ATI Rage XL AGP
@@ -1312,7 +1231,6 @@ NAME ATI Rage 128
 DRIVER r128
 DRI_GLX
 # DRI_GLX: 16 and 32 bits, prefer 16bit as no DMA.
-BAD_FB_RESTORE_XF3
 
 NAME ATI Rage 128 Mobility
 SEE ATI Rage 128
@@ -1347,21 +1265,18 @@ DRI_GLX
 DRIVER2 fglrx
 
 NAME ATI Radeon (fbdev)
-SERVER FBDev
 DRIVER fbdev
 DRIVER2 fglrx
 
 # AGX
 
 NAME AGX (generic)
-SERVER AGX
 DRIVER vga
 
 NAME EIZO (VRAM)
 SEE AGX (generic)
 
 NAME Hercules Graphite Pro
-SERVER AGX
 DRIVER vga
 # Card specific DAC, doesn't appear in ramdac menu
 LINE     Ramdac "herc_dual_dac"
@@ -1374,7 +1289,6 @@ LINE     #Clocks 25.0  28.0  32.0  36.0  40.0  45.0  50.0  65.0
 LINE     #Clocks 70.0  75.0  80.0  85.0  90.0  95.0 100.0 110.0
 
 NAME Hercules Graphite Power
-SERVER AGX
 DRIVER vga
 # Card specific DAC, doesn't appear in ramdac menu
 #   The glue logic state machine for RAMDAC switching doesn't work as
@@ -1390,14 +1304,12 @@ LINE     #Clocks 25.0  28.0  32.0  36.0  40.0  45.0  50.0  65.0
 LINE     #Clocks 70.0  75.0  80.0  85.0  90.0  95.0 100.0 110.0
 
 NAME XGA-2  (ISA bus)
-SERVER AGX
 DRIVER vga
 LINE     #Instance  7           # XGA instance 0-7
 LINE     #COPbase   0xC8F00     # XGA memory-mapped register address
 LINE     #POSbase   0           # Disable probing if above are specified
 
 NAME XGA-1  (ISA bus)
-SERVER AGX
 DRIVER vga
 LINE     #Instance  7           # XGA instance 0-7
 LINE     #COPbase   0xC8F00     # XGA memory-mapped register address
@@ -1406,19 +1318,15 @@ LINE     #POSbase   0           # Disable probing if above are specified
 # WD
 
 NAME Paradise/WD 90CXX
-SERVER SVGA
 DRIVER vga
 
 NAME DFI-WG6000
-SERVER SVGA
 DRIVER vga
 
 NAME Diamond SpeedStar 24X (not fully supported)
-SERVER SVGA
 DRIVER vga
 
 NAME WD 90C24 (laptop)
-SERVER SVGA
 DRIVER vga
 LINE     #Chipset "wd90c24"
 LINE     #Option "noaccel" # Use this if acceleration is causing problems
@@ -1430,7 +1338,6 @@ LINE     #Clocks 44.297                      # Must match Mclk
 
 
 NAME WD 90C24A or 90C24A2 (laptop)
-SERVER SVGA
 DRIVER vga
 LINE     #Chipset "wd90c24"
 LINE     #Clocks 25.175 28.322 65     36     # These are not programmable
@@ -1443,57 +1350,46 @@ LINE     #Clocks 44.297                      # Must match Mclk
 
 NAME Avance Logic 2101
 LINE   #chipset "al2101"
-SERVER SVGA
 DRIVER vga
 
 NAME Avance Logic 2228
 LINE   #chipset "ali2228"
-SERVER SVGA
 DRIVER vga
 
 NAME Avance Logic 2301
 LINE   #chipset "ali2301"
-SERVER SVGA
 DRIVER vga
 
 NAME Avance Logic 2302
 LINE   #chipset "ali2302"
-SERVER SVGA
 DRIVER vga
 
 NAME Avance Logic 2308
 LINE   #chipset "ali2308"
-SERVER SVGA
 DRIVER vga
 
 NAME Avance Logic 2401
 LINE   #chipset "ali2401"
-SERVER SVGA
 DRIVER vga
 
 NAME Hercules Stingray
 LINE   #chipset "ali2228"
-SERVER SVGA
 DRIVER vga
 
 # ARK Logic
 
 NAME Ark Logic ARK1000PV (generic)
-SERVER SVGA
 DRIVER ark
 
 # For now, treat the VL as a PV.  This may be changed later
 NAME Ark Logic ARK1000VL (generic)
 LINE Chipset "ark1000pv"
-SERVER SVGA
 DRIVER ark
 
 NAME Ark Logic ARK2000PV (generic)
-SERVER SVGA
 DRIVER ark
 
 NAME Ark Logic ARK2000MT (generic)
-SERVER SVGA
 DRIVER ark
 
 NAME Hercules Stingray Pro
@@ -1508,18 +1404,15 @@ SEE Ark Logic ARK2000PV (generic)
 # Oak
 
 NAME Oak ISA Card (generic)
-SERVER SVGA
 DRIVER vga
 
 NAME Oak 87 VLB (generic)
-SERVER SVGA
 DRIVER vga
 LINE Option "fifo_aggressive" # Comment this if you experience streaks.
 LINE Option "no_wait"         # Comment this if you find problems.        
 LINE #Option "enable_bitblt"  # You may enable this and see if it works (see README.Oak file)
 
 NAME Oak 87 ISA (generic)
-SERVER SVGA
 DRIVER vga
 LINE Option "noaccel"        # ISA cards seem to have Color Expansion support broken
 LINE #Option "enable_bitblt" # This should work on ISA, but lets not make it default just in case.
@@ -1530,7 +1423,6 @@ SEE Oak 87 ISA (generic)
 # P9000
 
 NAME Diamond Viper VLB 2Mb
-SERVER P9000
 DRIVER vga
 LINE     #Clocks must match the mode clocks (XFree86 3.1 P9000 server)
 LINE     #Versions later than 3.1 do not require a clocks line
@@ -1539,7 +1431,6 @@ LINE     Videoram 2048      # Required
 LINE     Membase 0x80000000 # Optional (0x80000000 is default)
 
 NAME Diamond Viper PCI 2Mb
-SERVER P9000
 DRIVER vga
 LINE     #Clocks must match the mode clocks (XFree86 3.1 P9000 server)
 LINE     #Versions later than 3.1 do not require a clocks line
@@ -1547,7 +1438,6 @@ LINE     Videoram 2048      # Required
 LINE     #Membase 0x80000000 # Use scanpci to get the correct Membase
 
 NAME Orchid P9000 VLB
-SERVER P9000
 DRIVER vga
 LINE     Chipset "orchid_p9000"
 LINE     Membase 0xE0000000
@@ -1555,7 +1445,6 @@ LINE     Membase 0xE0000000
 # P9100
 
 NAME Weitek P9100 (generic)
-SERVER SVGA
 DRIVER vga
 
 NAME Diamond Viper Pro Video
@@ -1564,119 +1453,90 @@ SEE Weitek P9100 (generic)
 # Trident
 
 NAME Trident 8900/9000 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident 8900D (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident TVGA9200CXr (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident TGUI9400CXi (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident TGUI9420DGi (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident TGUI9430DGi (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident TGUI9420 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident TGUI9440 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident TGUI9660 (generic)
 DRIVER trident
-SERVER SVGA
 
 NAME Trident TGUI9680 (generic)
 DRIVER trident
-SERVER SVGA
 
 NAME Trident TGUI9682 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident TGUI9685 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Cyber 9320 (generic)
 DRIVER trident
-SERVER SVGA
 
 NAME Trident Cyber 9382 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Cyber 9385 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Cyber 9388 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Cyber 939a (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Cyber 9397 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Cyber 9397 DVD (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Cyber 9520 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Cyber 9325 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident 3DImage975 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident 3DImage975 AGP (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident 3DImage985 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Providia 9682 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Providia 9685 (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Blade3D (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident CyberBlade (generic)
-SERVER SVGA
 DRIVER trident
 
 NAME Trident Cyber 9525 (generic)
-SERVER SVGA
 DRIVER trident
 LINE     # Option "accel" # Use this if acceleration works on your laptop
 
@@ -1699,7 +1559,6 @@ NAME SiS
 DRIVER sis
 
 NAME SiS SG86C205
-SERVER SVGA
 DRIVER sis
 BAD_FB_RESTORE
 LINE     # Option "no_accel" # Use this if acceleration is causing problems
@@ -1708,7 +1567,6 @@ LINE     # Option "fifo_conserv"
 LINE     # Option "fifo_aggresive" 
 
 NAME SiS SG86C215
-SERVER SVGA
 DRIVER sis
 BAD_FB_RESTORE
 LINE     # This is a cheap version of 86c205. I am not sure if acceleration works
@@ -1719,7 +1577,6 @@ LINE     # Option "fifo_conserv"
 LINE     # Option "fifo_aggresive" 
 
 NAME SiS SG86C225
-SERVER SVGA
 DRIVER sis
 BAD_FB_RESTORE
 LINE     # Option "no_accel" # Use this if acceleration is causing problems
@@ -1728,7 +1585,6 @@ LINE     # Option "fifo_conserv"
 LINE     # Option "fifo_aggresive" 
 
 NAME SiS 5597
-SERVER SVGA
 DRIVER sis
 BAD_FB_RESTORE
 LINE     # Option "no_accel" # Use this if acceleration is causing problems
@@ -1742,7 +1598,6 @@ LINE     # Option "ext_eng_queue" # Turbo-queue. This can cause drawing
 LINE                              # errors, but gives some accel
 
 NAME SiS 5598
-SERVER SVGA
 DRIVER sis
 BAD_FB_RESTORE
 LINE     # Option "no_accel" # Use this if acceleration is causing problems
@@ -1756,10 +1611,8 @@ LINE     # Option "ext_eng_queue" # Turbo-queue. This can cause drawing
 LINE                              # errors, but gives some accel
 
 NAME SiS 6326
-SERVER SVGA
 DRIVER sis
 DRI_GLX_EXPERIMENTAL
-UTAH_GLX_EXPERIMENTAL
 BAD_FB_RESTORE
 LINE     Option "sw_cursor"
 LINE     # Option "no_accel" # Use this if acceleration is causing problems
@@ -1777,34 +1630,26 @@ SEE SiS 6326
 LINE     Option "no_accel" # Use this if acceleration is causing problems
 
 NAME SiS Real256E
-SERVER SVGA
 DRIVER sis
 
 NAME SiS 530
-SERVER SVGA
 DRIVER sis
 
 NAME SiS 540
-SERVER SVGA
 DRIVER sis
 BAD_FB_RESTORE
 
 NAME SiS 620
-SERVER SVGA
 DRIVER sis
 
 NAME SiS 630
-SERVER SVGA
 DRIVER sis
 DRI_GLX_EXPERIMENTAL
-UTAH_GLX_EXPERIMENTAL
 
 NAME SiS 650
-SERVER SVGA
 DRIVER sis
 
 NAME SiS 300
-SERVER SVGA
 DRIVER sis
 BAD_FB_RESTORE
 
@@ -1855,57 +1700,45 @@ SEE SiS 6326
 # Cyrix
 
 NAME MediaGX
-SERVER SVGA
 DRIVER cyrix
 
 # Alliance ProMotion
 
 NAME Alliance ProMotion 6422
-SERVER SVGA
 DRIVER vga
 
 # Number 9 I128
 
 NAME Number Nine Imagine I-128 (2-8MB)
-SERVER I128
 DRIVER i128
 
 NAME Number Nine Imagine I-128 Series 2 (2-4MB)
-SERVER I128
 DRIVER i128
 
 NAME Revolution 3D (T2R)
-SERVER I128
 DRIVER i128
 
 NAME Number Nine Revolution 3D AGP (4-8MB SGRAM)
-SERVER I128
 DRIVER i128
 
 NAME Number Nine Imagine-128-T2R
-SERVER I128
 DRIVER i128
 
 # Matrox
 
 NAME Matrox Millennium
-SERVER SVGA
 DRIVER mga
 BAD_FB_RESTORE
 LINE Option	"sw_cursor"
 
 NAME Matrox Millennium II
-SERVER SVGA
 DRIVER mga
 BAD_FB_RESTORE
 
 NAME Matrox Millennium G200
-SERVER SVGA
 DRIVER mga
 DRI_GLX
 # DRI_GLX prefer 16bit with AGP only
-UTAH_GLX
-# Utah-GLX doesn't work in 8bpp
 BAD_FB_RESTORE
 
 NAME Matrox Millennium G200 DualHead
@@ -1943,40 +1776,29 @@ NAME Matrox Mystique
 SEE Matrox Millennium G200
 
 NAME Matrox Productiva G100
-SERVER SVGA
 DRIVER mga
 BAD_FB_RESTORE
 
 # NVIDIA
 
 NAME Diamond Edge 3D
-SERVER SVGA
 DRIVER vga
 
 NAME RIVA128
-SERVER SVGA
 DRIVER nv
-UTAH_GLX_EXPERIMENTAL
-# should be UTAH_GLX, but it's not working correctly enough
 BAD_FB_RESTORE
 
 NAME RIVA TNT
-SERVER SVGA
 DRIVER nv
-UTAH_GLX_EXPERIMENTAL
 BAD_FB_RESTORE
 
 NAME RIVA TNT2
-SERVER SVGA
 DRIVER nv
 DRIVER2 nvidia
-UTAH_GLX_EXPERIMENTAL
 
 NAME NVIDIA GeForce
-SERVER SVGA
 DRIVER nv
 DRIVER2 nvidia
-UTAH_GLX_EXPERIMENTAL
 
 NAME RIVA Ultra TNT2 
 SEE RIVA TNT2
@@ -2066,7 +1888,6 @@ NAME MELCO WGA-TS
 SEE RIVA TNT2 
 
 NAME NVIDIA GeForce (fbdev)
-SERVER FBDev
 DRIVER fbdev
 DRIVER2 nvidia
 
@@ -2092,16 +1913,17 @@ SEE NVIDIA GeForce
 NAME NVIDIA GeForce FX (generic)
 SEE NVIDIA GeForce
 
+NAME NVIDIA GeForce 6800 (generic)
+SEE NVIDIA GeForce
+
 # IMS
 
 NAME IMS TwinTurbo (generic)
-SERVER SVGA
 DRIVER imstt
 
 # 3DLabs
 
 NAME 3Dlabs Permedia2 (generic)
-SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 
@@ -2109,75 +1931,62 @@ NAME 3Dlabs Permedia4 (generic)
 DRIVER glint
 
 NAME Elsa GLoria-L/MX
-SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 
 NAME Elsa GLoria-L
-SERVER 3DLabs
 DRIVER glint
 
 NAME Elsa GLoria-XL
 LINE Option     "SWcursor"
-SERVER 3DLabs
 DRIVER glint
 
 NAME Elsa GLoria-XXL
 LINE Option     "SWcursor"
-SERVER 3DLabs
 DRIVER glint
 
 NAME Diamond Fire GL 3000
 LINE Option     "SWcursor"
-SERVER 3DLabs
 DRIVER glint
 LINE Option "firegl_3000"
 
 NAME Elsa GLoria-S
-SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 LINE #VideoRam 8192
 LINE Option     "SWcursor"
 
 NAME Diamond Fire GL 1000
-SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 LINE #VideoRam 8192
 LINE Option     "SWcursor"
 
 NAME Elsa GLoria Synergy
-SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 LINE Option     "SWcursor"
 
 NAME Elsa Winner 2000/Office
-SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 LINE Option     "SWcursor"
 
 NAME Diamond Fire GL 1000 PRO
-SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 LINE Option     "SWcursor"
 
 NAME AccelStar Permedia II AGP
-SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 LINE Option     "SWcursor"
 
 NAME Leadtek WinFast 2300
-SERVER 3DLabs
 DRIVER glint
 LINE Option     "SWcursor"
 
 NAME 3Dlabs Oxygen GMX
-SERVER 3DLabs
 DRIVER glint
 LINE #Option "no_accel"
 LINE Option     "SWcursor"
@@ -2185,11 +1994,9 @@ LINE Option     "SWcursor"
 # Alliance Semiconductor
 
 NAME Diamond Stealth Video 2500
-SERVER SVGA
 DRIVER apm
 
 NAME AT3D
-SERVER SVGA
 DRIVER apm
 LINE #Option "no_accel"
 
@@ -2202,7 +2009,6 @@ SEE AT3D
 # NeoMagic
 
 NAME NeoMagic (laptop/notebook)
-SERVER SVGA
 DRIVER neomagic
 LINE #    Chipset    "NM2160"
 LINE #    IOBase     0xfea00000
@@ -2236,7 +2042,6 @@ LINE Option "sw_cursor"
 # Epson SPC8110
 
 NAME Epson SPC8110 (CardPC)
-SERVER SVGA
 DRIVER vga
 LINE #    Chipset    "spc8110"
 LINE #    MemBase    0x03e00000
@@ -2250,12 +2055,10 @@ LINE #    Option     "fifo_conservative"
 # Rendition
 
 NAME Rendition Verite 1000
-SERVER SVGA
 DRIVER rendition
 LINE # Option "sw_cursor"
 
 NAME Rendition Verite 2x00
-SERVER SVGA
 DRIVER rendition
 LINE # Option "sw_cursor"
 
@@ -2279,14 +2082,11 @@ SEE Rendition Verite 2x00
 # Epson
 
 NAME Epson CardPC (onboard)
-SERVER SVGA
 
 # Intel
 
 NAME Intel 740 (generic)
-SERVER SVGA
 DRIVER i740
-BAD_FB_RESTORE_XF3
 LINE     #Option     "no_accel"
 LINE     #Option     "sw_cursor"
 LINE     #Option     "hw_cursor"
@@ -2402,21 +2202,17 @@ NAME Winfast S900 i740 AGP 8MB
 SEE Intel 740 (generic)
 
 NAME Intel 810
-SERVER SVGA
 DRIVER i810
-# UTAH_GLX  (not working)
 DRI_GLX
 LINE Option "XaaNoPixmapCache"
 
 NAME Intel 815
-SERVER SVGA
 DRIVER i810
 DRI_GLX
 # DRI_GLX 16bits
 LINE Option "XaaNoPixmapCache"
 
 NAME Intel 830
-SERVER SVGA
 DRIVER i810
 DRI_GLX
 
@@ -2433,18 +2229,15 @@ DRIVER i810
 DRI_GLX
 
 NAME Voodoo Banshee (generic)
-SERVER SVGA
 DRIVER tdfx
 DRI_GLX
 # DRI_GLX 16bit only
 
 NAME Voodoo Rush (generic)
-SERVER SVGA
 DRIVER tdfx
 LINE Option	"nodri"
 
 NAME Voodoo3 (generic)
-SERVER SVGA
 DRIVER tdfx
 DRI_GLX
 
@@ -2467,167 +2260,126 @@ SEE Voodoo Banshee (generic)
 # Silicon Motion, Inc.
 
 NAME Silicon Motion Lynx (generic)
-SERVER SVGA
 DRIVER siliconmotion
 
 NAME Silicon Motion LynxEM
-SERVER SVGA
 DRIVER siliconmotion
 
 NAME Silicon Motion Lynx (generic)
-SERVER SVGA
 DRIVER siliconmotion
 
 NAME Silicon Motion LynxE (generic)
-SERVER SVGA
 DRIVER siliconmotion
 
 NAME Silicon Motion Lynx3D (generic)
-SERVER SVGA
 DRIVER siliconmotion
 
 NAME Silicon Motion LynxEM (generic)
-SERVER SVGA
 DRIVER siliconmotion
 
 NAME Silicon Motion LynxEM+ (generic)
-SERVER SVGA
 DRIVER siliconmotion
 
 NAME Silicon Motion Lynx3DM (generic)
-SERVER SVGA
 DRIVER siliconmotion
 
 
 # Sun Cards / Servers (added by Red Hat Software 02/1999)
 
 NAME Sun Monochrome (bwtwo)
-SERVER SunMono
 DRIVER sunbw2
  
 NAME Sun Color3 (cgthree)
-SERVER Sun
 DRIVER suncg3
  
 NAME Sun CG8/RasterOps
-SERVER Sun
  
 NAME Sun GS (cgtwelve)
-SERVER Sun24
  
 NAME Sun Graphics Tower
-SERVER Sun24
 
 NAME Quantum 3D MGXplus with 4M VRAM
-SERVER Sun24
  
 NAME Quantum 3D MGXplus
-SERVER Sun24
  
 NAME Sun Unknown GX
-SERVER Sun
 DRIVER suncg6
  
 NAME Sun Double width GX
-SERVER Sun
 DRIVER suncg6
  
 NAME Sun Single width GX
-SERVER Sun
 DRIVER suncg6
 
 NAME Sun Turbo GX with 1M VSIMM
-SERVER Sun
 DRIVER suncg6
  
 NAME Sun Turbo GX Plus
-SERVER Sun
 DRIVER suncg6
  
 NAME Sun Turbo GX
-SERVER Sun
 DRIVER suncg6
  
 NAME Sun SX with 4M VSIMM
-SERVER Sun24
 DRIVER suncg14
  
 NAME Sun SX with 8M VSIMM
-SERVER Sun24
 DRIVER suncg14
  
 NAME Sun SX
-SERVER Sun24
 DRIVER suncg14
 
 NAME Sun Turbo ZX
-SERVER Sun24
 DRIVER sunleo
  
 NAME Sun ZX or Turbo ZX
-SERVER Sun24
 DRIVER sunleo
 
 NAME Sun TCX (8bit)
-SERVER Sun
 DRIVER suntcx
  
 NAME Sun TCX (S24)
-SERVER Sun24
 DRIVER suntcx
  
 NAME Sun Elite3D-M6 Horizontal
-SERVER Sun24
 DRIVER sunffb
  
 NAME Sun Elite3D
-SERVER Sun24
 DRIVER sunffb
 
 NAME Sun FFB 67MHz Creator
-SERVER Sun24
 DRIVER sunffb
  
 NAME Sun FFB 67MHz Creator 3D
-SERVER Sun24
 DRIVER sunffb
  
 NAME Sun FFB 75MHz Creator 3D
-SERVER Sun24
 DRIVER sunffb
  
 NAME Sun FFB2 Vertical Creator
-SERVER Sun24
 DRIVER sunffb
  
 NAME Sun FFB2 Vertical Creator 3D
-SERVER Sun24
 DRIVER sunffb
  
 NAME Sun FFB2Vertical Creator
-SERVER Sun24
 DRIVER sunffb
 
 NAME Sun FFB2Vertical Creator 3D
-SERVER Sun24
 DRIVER sunffb
  
 NAME Sun FFB2 Horizontal Creator
-SERVER Sun24
 DRIVER sunffb
  
 NAME Sun FFB2 Horizontal Creator 3D
-SERVER Sun24
 DRIVER sunffb
  
 NAME Sun FFB
-SERVER Sun24
 DRIVER sunffb
 
 # VMware virtual video cards
 
 NAME VMware virtual video card
-SERVER SVGA
 DRIVER vmware
 
 # Misc
diff --git a/lst/pcitable b/lst/pcitable
index b35d9771..bf3b3b2c 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -16,10 +16,10 @@
 0x0079	0x0e11	"bttv"	"Canopus|WinDVR PCI"
 0x0101	0x14c7	"bttv"	"Modular Technology MM205 PCTV"
 0x0101	0x15cb	"bttv"	"AG GMV1"
-0x018a	0x0106	"8139too"	""
-0x021b	0x8139	"8139too"	""
+0x018a	0x0106	"8139too"	"LevelOne|FPC-0106TX misprogrammed [RTL81xx]"
+0x021b	0x8139	"8139too"	"Compaq Computer Corp.|HNE-300 (RealTek RTL8139c) [iPaq Networking]"
 0x0291	0x8212	"unknown"	"Davicom Semiconductor, Inc.|DM9102A(DM9102AE, SM9102AF) Ethernet 100/10 MBit(Rev 40)"
-0x02ac	0x1012	"8139too"	""
+0x02ac	0x1012	"8139too"	"SpeedStream|1012 PCMCIA 10/100 Ethernet Card [RTL81xx]"
 0x0311	0x6000	"bttv"	"Sensoray 311"
 0x0675	0x1700	"ISDN:hisax,type=36"	"Dynalink|IS64PH ISDN Adapter"
 0x0675	0x1702	"ISDN:hisax,type=36"	"Dynalink|IS64PH ISDN Adapter"
@@ -35,7 +35,7 @@
 0x0e11	0x0001	"unknown"	"Compaq|PCI to EISA Bridge"
 0x0e11	0x0002	"unknown"	"Compaq|PCI to ISA Bridge"
 0x0e11	0x000f	"unknown"	"Compaq|CPQB1A9 StorageWorks Library Adapter (HVD)"
-0x0e11	0x0046	"cciss"	""
+0x0e11	0x0046	"cciss"	"Compaq|Smart Array 64xx"
 0x0e11	0x0049	"unknown"	"Compaq|NC7132 Gigabit Upgrade Module"
 0x0e11	0x004a	"unknown"	"Compaq|NC6136 Gigabit Server Adapter"
 0x0e11	0x007c	"unknown"	"Compaq|NC7770 1000BaseTX"
@@ -49,32 +49,32 @@
 0x0e11	0x00d0	"unknown"	"Compaq|NC7782"
 0x0e11	0x00d1	"unknown"	"Compaq|NC7783"
 0x0e11	0x00e3	"unknown"	"Compaq|NC7761"
-0x0e11	0x0508	"sktr"	"Compaq|Netelligent 4/16 Token Ring"
+0x0e11	0x0508	"tmspci"	"Compaq|Netelligent 4/16 Token Ring"
 0x0e11	0x1000	"unknown"	"Compaq|Triflex/Pentium Bridge, Model 1000"
 0x0e11	0x2000	"unknown"	"Compaq|Triflex/Pentium Bridge, Model 2000"
 0x0e11	0x3032	"unknown"	"Compaq|QVision 1280/p"
-0x0e11	0x3033	"Server:SVGA"	"Compaq|QVision 1280/p"
+0x0e11	0x3033	"unknown"	"Compaq|QVision 1280/p"
 0x0e11	0x3034	"unknown"	"Compaq|QVision 1280/p"
 0x0e11	0x4000	"unknown"	"Compaq|4000 [Triflex]"
-0x0e11	0x4030	"unknown"	"Compaq|SMART-2/P"
-0x0e11	0x4031	"unknown"	"Compaq|SMART-2SL"
-0x0e11	0x4032	"unknown"	"Compaq|Smart Array 3200"
-0x0e11	0x4033	"unknown"	"Compaq|Smart Array 3100ES"
-0x0e11	0x4034	"unknown"	"Compaq|Smart Array 221"
-0x0e11	0x4040	"unknown"	"Compaq|Integrated Array"
-0x0e11	0x4048	"unknown"	"Compaq|Compaq Raid LC2"
-0x0e11	0x4050	"unknown"	"Compaq|Smart Array 4200"
-0x0e11	0x4051	"unknown"	"Compaq|Smart Array 4250ES"
-0x0e11	0x4058	"unknown"	"Compaq|Smart Array 431"
-0x0e11	0x4070	"unknown"	"Compaq|Smart Array 5300"
-0x0e11	0x4080	"unknown"	"Compaq|Smart Array 5i"
-0x0e11	0x4082	"unknown"	"Compaq|Smart Array 532"
-0x0e11	0x4083	"unknown"	"Compaq|Smart Array 5312"
-0x0e11	0x4091	"unknown"	"Compaq|Smart Array 6i"
-0x0e11	0x409a	"unknown"	"Compaq|Smart Array 641"
-0x0e11	0x409b	"unknown"	"Compaq|Smart Array 642"
-0x0e11	0x409c	"unknown"	"Compaq|Smart Array 6400"
-0x0e11	0x409d	"unknown"	"Compaq|Smart Array 6400 EM"
+0x0e11	0x4030	"cpqarray"	"Compaq|SMART-2/P"
+0x0e11	0x4031	"cpqarray"	"Compaq|SMART-2SL"
+0x0e11	0x4032	"cpqarray"	"Compaq|Smart Array 3200"
+0x0e11	0x4033	"cpqarray"	"Compaq|Smart Array 3100ES"
+0x0e11	0x4034	"cpqarray"	"Compaq|Smart Array 221"
+0x0e11	0x4040	"cpqarray"	"Compaq|Integrated Array"
+0x0e11	0x4048	"cpqarray"	"Compaq|Compaq Raid LC2"
+0x0e11	0x4050	"cpqarray"	"Compaq|Smart Array 4200"
+0x0e11	0x4051	"cpqarray"	"Compaq|Smart Array 4250ES"
+0x0e11	0x4058	"cpqarray"	"Compaq|Smart Array 431"
+0x0e11	0x4070	"cciss"	"Compaq|Smart Array 5300"
+0x0e11	0x4080	"cciss"	"Compaq|Smart Array 5i"
+0x0e11	0x4082	"cciss"	"Compaq|Smart Array 532"
+0x0e11	0x4083	"cciss"	"Compaq|Smart Array 5312"
+0x0e11	0x4091	"cciss"	"Compaq|Smart Array 6i"
+0x0e11	0x409a	"cciss"	"Compaq|Smart Array 641"
+0x0e11	0x409b	"cciss"	"Compaq|Smart Array 642"
+0x0e11	0x409c	"cciss"	"Compaq|Smart Array 6400"
+0x0e11	0x409d	"cciss"	"Compaq|Smart Array 6400 EM"
 0x0e11	0x6010	"unknown"	"Compaq|HotPlug PCI Bridge 6010"
 0x0e11	0x7020	"usb-ohci"	"Compaq|USB Controller"
 0x0e11	0xa0ec	"unknown"	"Compaq|Fibre Channel Host Controller /P"
@@ -89,7 +89,7 @@
 0x0e11	0xae2b	"unknown"	"Compaq|MIS-E"
 0x0e11	0xae31	"unknown"	"Compaq|System Management Controller"
 0x0e11	0xae32	"tlan"	"Compaq|Netelligent 10/100"
-0x0e11	0xae33	"unknown"	"Compaq|Triflex Dual EIDE Controller"
+0x0e11	0xae33	"triflex"	"Compaq|Triflex Dual EIDE Controller"
 0x0e11	0xae34	"tlan"	"Compaq|Netelligent 10"
 0x0e11	0xae35	"tlan"	"Compaq|Integrated NetFlex-3/P"
 0x0e11	0xae40	"tlan"	"Compaq|Netelligent 10/100 Dual"
@@ -122,6 +122,7 @@
 0x0e11	0xb178	"cciss"	"CISSB|Smart Array 5i/532 cards"
 0x0e11	0xb196	"unknown"	"Compaq Computer Corp.|Conexant SoftK56 Modem"
 0x0e11	0xb1a4	"unknown"	"Compaq|NC7131 Gigabit Server Adapter"
+0x0e11	0xb200	"unknown"	"Compaq Computer Corp.|Memory Hot-Plug Controller"
 0x0e11	0xb203	"unknown"	"Compaq Computer Corp.|iLo Integrated Lights Out Processor"
 0x0e11	0xb204	"unknown"	"Compaq Computer Corp.|iLo Integrated Lights Out Processor"
 0x0e11	0xf130	"tlan"	"Compaq|NetFlex-3/P ThunderLAN 1.0"
@@ -141,6 +142,7 @@
 0x1000	0x000f	"sym53c8xx"	"Symbios|53c875"
 0x1000	0x0010	0x0e11	0x4040	"cpqarray"	"Symbios|53c1510 Array Mode [Compaq Integrated Smart Array]"
 0x1000	0x0010	0x0e11	0x4048	"cpqarray"	"Symbios|53c1510 Array Mode [Compaq Integrated Smart Array]"
+0x1000	0x0010	0x1000	0x1000	"sym53c8xx"	"LSI Logic / Symbios Logic|53C1510 PCI to Dual Channel Wide Ultra2 SCSI Controller (Intelligent mode)"
 0x1000	0x0010	"sym53c8xx"	"Symbios|53c895"
 0x1000	0x0012	"sym53c8xx"	"Symbios|53c895a"
 0x1000	0x0013	"sym53c8xx"	"Symbios|53c875a"
@@ -157,6 +159,8 @@
 0x1000	0x0041	"unknown"	"LSI Logic / Symbios Logic|53C1035ZC PCI-X Fusion-MPT Dual Ultra320 SCSI"
 0x1000	0x008f	"sym53c8xx"	"Symbios|53c875J"
 0x1000	0x0407	"megaraid"	"LSI Logic|PowerEdge RAID Controller 4/QC"
+0x1000	0x0408	"megaraid"	"LSI Logic / Symbios Logic|MegaRAID"
+0x1000	0x0409	"megaraid"	"LSI Logic / Symbios Logic|MegaRAID"
 0x1000	0x0621	"mptscsih"	"Symbios|FC909"
 0x1000	0x0622	"mptscsih"	"Symbios|FC929"
 0x1000	0x0623	"mptscsih"	"Symbios|FC929 LAN"
@@ -189,6 +193,12 @@
 0x1001	0x9100	"initio"	"Initio|INI-9100/9100W SCSI Host"
 0x1002	0x0084	"Card:ATI Mach64"	"ATI|Mach64"
 0x1002	0x0088	"Card:ATI Mach64"	"ATI|Mach64 (SuSE Econ)"
+0x1002	0x3150	"unknown"	"ATI Technologies Inc|M24 1P [Radeon Mobility X600]"
+0x1002	0x3154	"unknown"	"ATI Technologies Inc|M24 1T [FireGL M24 GL]"
+0x1002	0x3e50	"Card:ATI Radeon (fglrx)"	"ATI Technologies Inc|Radeon X600 Pro (PCI-Express)"
+0x1002	0x3e54	"Card:ATI Radeon (fglrx)"	"ATI Technologies Inc|Radeon X600 Pro GL (PCI-Express)"
+0x1002	0x3e70	"unknown"	"ATI Technologies Inc|X600 Radeon X600 Pro (Secondary)"
+0x1002	0x3e74	"unknown"	"ATI Technologies Inc|X600 Radeon X600 Pro GL (Secondary)"
 0x1002	0x4136	"Card:ATI Radeon (fglrx)"	"ATI|Radeon IGP320 (A3) 4136"
 0x1002	0x4137	"Card:ATI Radeon (fglrx)"	"ATI|Radeon IGP330/340/350 (A4) 4137"
 0x1002	0x4144	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9500 AD (AGP)"
@@ -204,9 +214,9 @@
 0x1002	0x4152	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9600XT AR (AGP)"
 0x1002	0x4153	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9600 AS (AGP)"
 0x1002	0x4154	"Card:ATI Radeon (fglrx)"	"ATI|FireGL T2 AT (AGP)"
-0x1002	0x4155	"Card:ATI Radeon (fbdev)"	""
+0x1002	0x4155	"Card:ATI Radeon (fbdev)"	"ATI Technologies Inc|RV350 AU [Fire GL T2]"
 0x1002	0x4156	"Card:ATI Radeon (fglrx)"	"ATI|FireGL RV360 AV (AGP)"
-0x1002	0x4157	"Card:ATI Radeon (fbdev)"	""
+0x1002	0x4157	"Card:ATI Radeon (fbdev)"	"ATI Technologies Inc|RV350 AW [Fire GL T2]"
 0x1002	0x4158	"Card:ATI Mach64"	"ATI|Mach32"
 0x1002	0x4164	"unknown"	"ATI|R300 Radeon 9700/9500 Series - Secondary"
 0x1002	0x4165	"unknown"	"ATI|R300 AE [Radeon 9700 Pro] (Secondary)"
@@ -216,15 +226,34 @@
 0x1002	0x4170	"unknown"	"ATI|RV350 AP [Radeon 9600] (Secondary)"
 0x1002	0x4171	"unknown"	"ATI|RV350 AQ [Radeon 9600] (Secondary)"
 0x1002	0x4172	"unknown"	"ATI|RV350 AR [Radeon 9600] (Secondary)"
+0x1002	0x4173	"unknown"	"ATI Technologies Inc|RV350 ?? [Radeon 9550] (Secondary)"
 0x1002	0x4237	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 7000 IGP (A4+) 4237"
 0x1002	0x4242	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 8500 AIW BB (AGP)"
 0x1002	0x4243	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 8500 AIW BC (AGP)"
-0x1002	0x4336	"Card:ATI Radeon"	"ATI|Radeon IGP320M (U1) 4336"
-0x1002	0x4337	"Card:ATI Radeon"	"ATI|Radeon IGP330M/340M/350M (U2) 4337"
-0x1002	0x4341	"unknown"	"ATI|IXP150 AC'97 Audio Controller"
+0x1002	0x4336	"Card:ATI Radeon (fglrx)"	"ATI|Radeon IGP320M (U1) 4336"
+0x1002	0x4337	"Card:ATI Radeon (fglrx)"	"ATI|Radeon IGP330M/340M/350M (U2) 4337"
+0x1002	0x4341	"snd-atiixp"	"ATI|IXP150 AC'97 Audio Controller"
+0x1002	0x4345	"unknown"	"ATI Technologies Inc|EHCI USB Controller"
+0x1002	0x4347	"unknown"	"ATI Technologies Inc|OHCI USB Controller #1"
+0x1002	0x4348	"unknown"	"ATI Technologies Inc|OHCI USB Controller #2"
+0x1002	0x434d	"unknown"	"ATI Technologies Inc|IXP AC'97 Modem"
 0x1002	0x4353	"unknown"	"ATI|ATI SMBus"
 0x1002	0x4354	"Card:ATI Mach64"	"ATI|215CT [Mach64 CT]"
 0x1002	0x4358	"Card:ATI Mach64"	"ATI|210888CX [Mach64 CX]"
+0x1002	0x4361	"snd-atiixp"	"ATI|"
+0x1002	0x4363	"unknown"	"ATI Technologies Inc|ATI SMBus"
+0x1002	0x436e	"sata_sil"	"ATI Technologies Inc|ATI 436E Serial ATA Controller"
+0x1002	0x4370	"snd-atiixp"	"ATI Technologies Inc.|IXP400 AC'97 Audio Controller"
+0x1002	0x4371	"unknown"	"ATI Technologies Inc.|IXP SB400 PCI-PCI Bridge"
+0x1002	0x4372	"unknown"	"ATI Technologies Inc.|SMBus"
+0x1002	0x4373	"unknown"	"ATI Technologies Inc.|IXP SB400 USB2 Host Controller"
+0x1002	0x4374	"unknown"	"ATI Technologies Inc.|IXP SB400 USB Host Controller"
+0x1002	0x4375	"unknown"	"ATI Technologies Inc.|IXP SB400 USB Host Controller"
+0x1002	0x4376	"atiixp"	"ATI Technologies Inc.|Standard Dual Channel PCI IDE Controller ATI"
+0x1002	0x4377	"unknown"	"ATI Technologies Inc.|IXP SB400 PCI-ISA Bridge"
+0x1002	0x4378	"snd-atiixp-modem"	"ATI Technologies Inc.|IXP AC'97 Modem"
+0x1002	0x4379	"sata_sil"	"ATI Technologies Inc|ATI 4379 Serial ATA Controller"
+0x1002	0x437a	"sata_sil"	"ATI Technologies Inc|ATI 437A Serial ATA Controller"
 0x1002	0x4437	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility 7000 IGP 4437"
 0x1002	0x4554	"Card:ATI Mach64"	"ATI|210888ET [Mach64 ET]"
 0x1002	0x4654	"Card:ATI Mach64"	"ATI|Mach64 VT"
@@ -251,10 +280,26 @@
 0x1002	0x4965	"Card:ATI Radeon (fglrx)"	"ATI|Radeon RV250 Ie [Radeon 9000]"
 0x1002	0x4966	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9000/PRO If (AGP/PCI)"
 0x1002	0x4967	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9000 Ig (AGP/PCI)"
-0x1002	0x496c	"Card:ATI Radeon (fbdev)"	""
-0x1002	0x496d	"Card:ATI Radeon (fbdev)"	""
+0x1002	0x496c	"Card:ATI Radeon (fbdev)"	"ATI|"
+0x1002	0x496d	"Card:ATI Radeon (fbdev)"	"ATI|"
 0x1002	0x496e	"Card:ATI Radeon (fglrx)"	"ATI|Radeon R250 [Radeon 9000] (Secondary)"
-0x1002	0x496f	"Card:ATI Radeon (fbdev)"	""
+0x1002	0x496f	"Card:ATI Radeon (fbdev)"	"ATI|"
+0x1002	0x4a48	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420)"
+0x1002	0x4a49	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 Pro"
+0x1002	0x4a4a	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420)"
+0x1002	0x4a4b	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420)"
+0x1002	0x4a4c	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420)"
+0x1002	0x4a4d	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420)"
+0x1002	0x4a4e	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420)"
+0x1002	0x4a50	"unknown"	"ATI Technologies Inc|R420 JP [Radeon X800XT]"
+0x1002	0x4a68	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420) (Secondary)"
+0x1002	0x4a69	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420) (Secondary)"
+0x1002	0x4a6a	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420) (Secondary)"
+0x1002	0x4a6b	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420) (Secondary)"
+0x1002	0x4a6c	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420) (Secondary)"
+0x1002	0x4a6d	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420) (Secondary)"
+0x1002	0x4a6e	"Card:ATI Radeon (fglrx)"	"ATI|Radeon X800 (R420) (Secondary)"
+0x1002	0x4a70	"unknown"	"ATI Technologies Inc|R420 [X800XT-PE] (Secondary)"
 0x1002	0x4c42	"Card:ATI Mach64 Utah"	"ATI|3D Rage LT Pro AGP-133"
 0x1002	0x4c44	"Card:ATI Mach64 Utah"	"ATI|3D Rage LT Pro AGP-66"
 0x1002	0x4c45	"Card:ATI Rage 128 Mobility"	"ATI|Rage Mobility M3 AGP"
@@ -268,18 +313,18 @@
 0x1002	0x4c52	"Card:ATI Rage Mobility"	"ATI|Rage Mobility P/M"
 0x1002	0x4c53	"Card:ATI Rage Mobility"	"ATI|Rage Mobility L"
 0x1002	0x4c54	"Card:ATI Mach64 Utah"	"ATI|264LT [Mach64 LT]"
-0x1002	0x4c57	"Card:ATI Radeon"	"ATI|Radeon Mobility M7 LW (AGP)"
+0x1002	0x4c57	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility M7 LW (AGP)"
 0x1002	0x4c58	"Card:ATI Radeon"	"ATI|Mobility FireGL 7800 M7 LX (AGP)"
-0x1002	0x4c59	"Card:ATI Radeon"	"ATI|Radeon Mobility M6 LY (AGP)"
-0x1002	0x4c5a	"Card:ATI Radeon"	"ATI|Radeon Mobility M6 LZ (AGP)"
+0x1002	0x4c59	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility M6 LY (AGP)"
+0x1002	0x4c5a	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility M6 LZ (AGP)"
 0x1002	0x4c64	"Card:ATI Radeon (fglrx)"	"ATI|FireGL Mobility 9000 (M9) Ld (AGP)"
 0x1002	0x4c65	"Card:ATI Radeon (fglrx)"	"ATI|Radeon RV250 Le [Radeon Mobility 9000]"
 0x1002	0x4c66	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility 9000 (M9) Lf (AGP)"
 0x1002	0x4c67	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility 9000 (M9) Lg (AGP)"
-0x1002	0x4c6c	"Card:ATI Radeon (fbdev)"	""
-0x1002	0x4c6d	"Card:ATI Radeon (fbdev)"	""
+0x1002	0x4c6c	"Card:ATI Radeon (fbdev)"	"ATI|"
+0x1002	0x4c6d	"Card:ATI Radeon (fbdev)"	"ATI|"
 0x1002	0x4c6e	"Card:ATI Radeon (fglrx)"	"ATI|Radeon R250 Ln [Radeon Mobility 9000 M9] [Secondary]"
-0x1002	0x4c6f	"Card:ATI Radeon (fbdev)"	""
+0x1002	0x4c6f	"Card:ATI Radeon (fbdev)"	"ATI|"
 0x1002	0x4d46	"Card:ATI Rage 128 Mobility"	"ATI|Rage Mobility M4 AGP"
 0x1002	0x4d4c	"Card:ATI Rage 128 Mobility"	"ATI|Rage Mobility M4 AGP"
 0x1002	0x4e44	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9700 Pro ND (AGP)"
@@ -296,13 +341,13 @@
 0x1002	0x4e53	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility 9600 (M10) NS (AGP)"
 0x1002	0x4e54	"Card:ATI Radeon (fglrx)"	"ATI|FireGL Mobility T2 (M10) NT (AGP)"
 0x1002	0x4e56	"Card:ATI Radeon (fglrx)"	"ATI|FireGL Mobility T2 (M11) NV (AGP)"
-0x1002	0x4e64	"Card:ATI Radeon"	"ATI|Radeon R300 [Radeon 9700] (Secondary)"
-0x1002	0x4e65	"unknown"	"ATI|R300 Radeon 9700/9500 Series - Secondary"
+0x1002	0x4e64	"Card:ATI Radeon (fglrx)"	"ATI|R300 Radeon 9700 (Secondary)"
+0x1002	0x4e65	"Card:ATI Radeon (fglrx)"	"ATI|R300 Radeon 9700/9500 Series (Secondary)"
 0x1002	0x4e66	"unknown"	"ATI|Radeon R300 [Radeon 9700] (Secondary)"
 0x1002	0x4e67	"unknown"	"ATI|ATI Fire GL X1/Z1 SECONDARY Video"
 0x1002	0x4e68	"unknown"	"ATI|Radeon R300 [Radeon 9800] (Secondary)"
 0x1002	0x4e69	"unknown"	"ATI|Radeon R350 [Radeon 9800] (Secondary)"
-0x1002	0x4e6a	"unknown"	"ATI|R350 Radeon 9800 XT - Secondary"
+0x1002	0x4e6a	"unknown"	"ATI|R360 Radeon 9800 XT - Secondary"
 0x1002	0x5041	"Card:ATI Rage 128"	"ATI|Rage 128 Pro"
 0x1002	0x5042	"Card:ATI Rage 128"	"ATI|Rage 128 Pro AGP 2x"
 0x1002	0x5043	"Card:ATI Rage 128"	"ATI|Rage 128 Pro AGP 4x"
@@ -327,24 +372,24 @@
 0x1002	0x5056	"Card:ATI Rage 128"	"ATI|Rage 128 Pro"
 0x1002	0x5057	"Card:ATI Rage 128"	"ATI|Rage 128 Pro AGP 2x"
 0x1002	0x5058	"Card:ATI Rage 128"	"ATI|Rage 128 Pro AGP 4x"
-0x1002	0x5144	"Card:ATI Radeon"	"ATI|Radeon QD (AGP)"
-0x1002	0x5145	"Card:ATI Radeon"	"ATI|Radeon QE (AGP)"
-0x1002	0x5146	"Card:ATI Radeon"	"ATI|Radeon QF (AGP)"
-0x1002	0x5147	"Card:ATI Radeon"	"ATI|Radeon QG (AGP)"
+0x1002	0x5144	"Card:ATI Radeon (fglrx)"	"ATI|Radeon QD (AGP)"
+0x1002	0x5145	"Card:ATI Radeon (fglrx)"	"ATI|Radeon QE (AGP)"
+0x1002	0x5146	"Card:ATI Radeon (fglrx)"	"ATI|Radeon QF (AGP)"
+0x1002	0x5147	"Card:ATI Radeon (fglrx)"	"ATI|Radeon QG (AGP)"
 0x1002	0x5148	"Card:ATI Radeon (fglrx)"	"ATI|FireGL 8700/8800 QH (AGP)"
 0x1002	0x5149	"Card:ATI Radeon"	"ATI|Radeon R200 QI"
 0x1002	0x514a	"Card:ATI Radeon"	"ATI|Radeon R200 QJ"
 0x1002	0x514b	"Card:ATI Radeon"	"ATI|Radeon R200 QK"
 0x1002	0x514c	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 8500 QL (AGP)"
 0x1002	0x514d	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9100 QM (AGP)"
-0x1002	0x514e	"Card:ATI Radeon 8500"	"ATI|Radeon 8500 QN"
-0x1002	0x514f	"Card:ATI Radeon 8500"	"ATI|Radeon 8500 QO"
+0x1002	0x514e	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 8500 QN R200"
+0x1002	0x514f	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 8500 QO R200"
 0x1002	0x5154	"unknown"	"ATI|R200 QT [Radeon 8500]"
 0x1002	0x5155	"unknown"	"ATI|R200 QU [Radeon 9100]"
 0x1002	0x5157	"Card:ATI Radeon"	"ATI|Radeon 7500 QW (AGP/PCI)"
 0x1002	0x5158	"Card:ATI Radeon"	"ATI|Radeon 7500 QX (AGP/PCI)"
-0x1002	0x5159	"Card:ATI Radeon"	"ATI|Radeon VE/7000 QY (AGP/PCI)"
-0x1002	0x515a	"Card:ATI Radeon"	"ATI|Radeon VE/7000 QZ (AGP/PCI)"
+0x1002	0x5159	"Card:ATI Radeon (fglrx)"	"ATI|Radeon VE/7000 QY (AGP/PCI)"
+0x1002	0x515a	"Card:ATI Radeon (fglrx)"	"ATI|Radeon VE/7000 QZ (AGP/PCI)"
 0x1002	0x5168	"Card:ATI Radeon"	"ATI|Radeon R200 Qh"
 0x1002	0x5169	"Card:ATI Radeon"	"ATI|Radeon R200 Qi"
 0x1002	0x516a	"Card:ATI Radeon"	"ATI|Radeon R200 Qj"
@@ -371,6 +416,16 @@
 0x1002	0x5453	"Card:ATI Rage 128"	"ATI|Rage 128 Pro Ultra TS"
 0x1002	0x5454	"Card:ATI Rage 128"	"ATI|Rage 128 Pro Ultra TT"
 0x1002	0x5455	"Card:ATI Rage 128"	"ATI|Rage 128 Pro Ultra TU"
+0x1002	0x5460	"unknown"	"ATI Technologies Inc|M22 [Radeon Mobility M300]"
+0x1002	0x5464	"unknown"	"ATI Technologies Inc|M22 [FireGL GL]"
+0x1002	0x5548	"unknown"	"ATI Technologies Inc|R423 UH [Radeon X800 (PCIE)]"
+0x1002	0x5549	"unknown"	"ATI Technologies Inc|R423 UI [Radeon X800PRO (PCIE)]"
+0x1002	0x554a	"unknown"	"ATI Technologies Inc|R423 UJ [Radeon X800LE (PCIE)]"
+0x1002	0x554b	"unknown"	"ATI Technologies Inc|R423 UK [Radeon X800SE (PCIE)]"
+0x1002	0x5551	"unknown"	"ATI Technologies Inc|R423 UQ [FireGL V7200 (PCIE)]"
+0x1002	0x5552	"unknown"	"ATI Technologies Inc|R423 UR [FireGL V5100 (PCIE)]"
+0x1002	0x5554	"unknown"	"ATI Technologies Inc|R423 UT [FireGL V7100 (PCIE)]"
+0x1002	0x556b	"unknown"	"ATI Technologies Inc|Radeon R423 UK (PCIE) [X800 SE] (Secondary)"
 0x1002	0x5654	"Card:ATI Mach64 VT (264VT)"	"ATI|264VT [Mach64 VT]"
 0x1002	0x5655	"Card:ATI Mach64 VT (264VT)"	"ATI|264VT3 [Mach64 VT3]"
 0x1002	0x5656	"Card:ATI Mach64 VT (264VT)"	"ATI|264VT4 [Mach64 VT4]"
@@ -380,18 +435,37 @@
 0x1002	0x5833	"ati-agp"	"ATI|CPU to PCI Bridge"
 0x1002	0x5834	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9100 IGP (A5) 5834"
 0x1002	0x5835	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility 9100 IGP (U3) 5835"
+0x1002	0x5838	"unknown"	"ATI Technologies Inc|Radeon 9100 IGP AGP Bridge"
 0x1002	0x5940	"unknown"	"ATI|RV280 Radeon 9200 Pro - Secondary"
 0x1002	0x5941	"unknown"	"ATI|RV280 ATI Radeon 9200 - Secondary"
+0x1002	0x5950	"unknown"	"ATI Technologies Inc.|RS480 Host Bridge"
+0x1002	0x5954	"Card:ATI Radeon (fglrx)"	"ATI Technologies Inc.|Radeon XPRESS 200 (RS480 5954)"
+0x1002	0x5955	"Card:ATI Radeon (fglrx)"	"ATI Technologies Inc.|Radeon XPRESS 200M (RS480 5955)"
 0x1002	0x5960	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9200PRO 5960 (AGP)"
 0x1002	0x5961	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9200 5961 (AGP)"
 0x1002	0x5962	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9200 5962 (AGP)"
 0x1002	0x5964	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9200SE 5964 (AGP)"
+0x1002	0x5a34	"unknown"	"ATI Technologies Inc.|RS480 PCI-X Root Port"
+0x1002	0x5a41	"unknown"	"ATI Technologies Inc|RS400 [Radeon Xpress 200]"
+0x1002	0x5a42	"unknown"	"ATI Technologies Inc|RS400 [Radeon Xpress 200M]"
+0x1002	0x5a61	"unknown"	"ATI Technologies Inc|RC410 [Radeon Xpress 200]"
+0x1002	0x5a62	"unknown"	"ATI Technologies Inc|RC410 [Radeon Xpress 200M]"
+0x1002	0x5b60	"Card:ATI Radeon (fglrx)"	"ATI|Radeon (RV370)"
+0x1002	0x5b62	"unknown"	"ATI Technologies Inc|RV370 5B62 [Radeon X600 (PCIE)]"
+0x1002	0x5b64	"Card:ATI Radeon (fglrx)"	"ATI|Radeon (RV370 GL)"
+0x1002	0x5b65	"unknown"	"ATI Technologies Inc|RV370 5B65 [FireGL D1100 (PCIE)]"
+0x1002	0x5b70	"Card:ATI Radeon (fglrx)"	"ATI|Radeon (RV370)"
+0x1002	0x5b74	"Card:ATI Radeon (fglrx)"	"ATI|Radeon (RV370 GL) (Secondary)"
 0x1002	0x5c61	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility 9200 (M9+) 5C61 (AGP)"
 0x1002	0x5c63	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility 9200 (M9+) 5C63 (AGP)"
 0x1002	0x5d44	"unknown"	"ATI|RV280 Radeon 9200 SE Series - Secondary"
+0x1002	0x5d57	"unknown"	"ATI Technologies Inc|R423 5F57 [Radeon X800XT (PCIE)]"
 0x1002	0x700f	"unknown"	"ATI|U1/A3 AGP Bridge [IGP 320M]"
 0x1002	0x7010	"unknown"	"ATI|PCI Bridge [IGP 340M]"
 0x1002	0x7800	"unknown"	"ATI| "
+0x1002	0x7834	"Card:ATI Radeon (fglrx)"	"ATI|Radeon 9000 XT IGP (AGP)"
+0x1002	0x7835	"Card:ATI Radeon (fglrx)"	"ATI|Radeon Mobility 9200 IGP (RS350M) (AGP)"
+0x1002	0x7c37	"unknown"	"ATI Technologies Inc|RV350 AQ [Radeon 9600 SE]"
 0x1002	0xcab0	"ati-agp"	"ATI|CPU to PCI Bridge"
 0x1002	0xcab1	"unknown"	"ATI|A3/U1 Slot1 CPU to PCI Bridge"
 0x1002	0xcab2	"ati-agp"	"ATI|RS200/RS200M AGP Bridge [IGP 340M]"
@@ -438,12 +512,12 @@
 0x100b	0x0021	"unknown"	"National Semiconductor|PC87200 PCI to ISA Bridge"
 0x100b	0x0022	"ns83820"	"National Semi|DP83820 10/100/1000 Ethernet"
 0x100b	0x0023	"unknown"	"National Semiconductor| "
-0x100b	0x0028	"unknown"	"National Semiconductor Corporation|CS5535 Host bridge"
-0x100b	0x002b	"unknown"	"National Semiconductor Corporation|CS5535 ISA bridge"
-0x100b	0x002d	"unknown"	"National Semiconductor Corporation|CS5535 IDE"
-0x100b	0x002e	"unknown"	"National Semiconductor Corporation|CS5535 Audio"
-0x100b	0x002f	"unknown"	"National Semiconductor Corporation|CS5535 USB"
-0x100b	0x0030	"unknown"	"National Semiconductor Corporation|CS5535 Video"
+0x100b	0x0028	"unknown"	"National Semiconductor Corp.|CS5535 Host bridge"
+0x100b	0x002b	"unknown"	"National Semiconductor Corp.|CS5535 ISA bridge"
+0x100b	0x002d	"unknown"	"National Semiconductor Corp.|CS5535 IDE"
+0x100b	0x002e	"unknown"	"National Semiconductor Corp.|CS5535 Audio"
+0x100b	0x002f	"unknown"	"National Semiconductor Corp.|CS5535 USB"
+0x100b	0x0030	"unknown"	"National Semiconductor Corp.|CS5535 Video"
 0x100b	0x0500	"Card:ATI Mach64"	"National Semiconductor|SCx200 Bridge"
 0x100b	0x0501	"Card:ATI Mach64"	"National Semiconductor|SCx200 SMI"
 0x100b	0x0502	"Card:ATI Mach64"	"National Semiconductor|SCx200 IDE"
@@ -467,13 +541,13 @@
 0x100e	0x9002	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9000 Viper"
 0x100e	0x9100	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9100 Viper Pro/SE"
 0x1011	0x0001	"tulip"	"DEC|DECchip 21050"
-0x1011	0x0002	"tulip"	"DEC|DECchip 21040 [Tulip]"
+0x1011	0x0002	"de2104x"	"DEC|DECchip 21040 [Tulip]"
 0x1011	0x0004	"unknown"	"DEC|21030/TGA"
 0x1011	0x0007	"unknown"	"DEC|NVRAM [Zephyr NVRAM]"
 0x1011	0x0008	"unknown"	"DEC|KZPSA [KZPSA]"
 0x1011	0x0009	"tulip"	"DEC|DECchip 21140 [FasterNet]"
 0x1011	0x000a	"unknown"	"DEC|21230 Video Codec"
-0x1011	0x000c	"unknown"	"Digital Equipment Corporation|DC21130 PCI Integrated Graphics & Video Accel"
+0x1011	0x000c	"unknown"	"Digital Equipment Corp.|DC21130 PCI Integrated Graphics & Video Accel"
 0x1011	0x000d	"unknown"	"DEC|PBXGB [TGA2]"
 0x1011	0x000f	"defxx"	"DEC|DEFPA"
 0x1011	0x0014	"de2104x"	"DEC|DECchip 21041 [Tulip Pass 3]"
@@ -487,21 +561,22 @@
 0x1011	0x0024	"unknown"	"DEC|DECchip 21152"
 0x1011	0x0025	"unknown"	"DEC|DECchip 21153"
 0x1011	0x0026	"unknown"	"DEC|DECchip 21154"
-0x1011	0x0034	"unknown"	"Digital Equipment Corporation|Modem56 CardBus"
+0x1011	0x0034	"unknown"	"Digital Equipment Corp.|Modem56 CardBus"
 0x1011	0x0045	"unknown"	"DEC|DECchip 21553"
 0x1011	0x0046	0x0e11	0x4050	"cpqarray"	"DEC|DECchip 21554 [Compaq Smart Array Controller]"
 0x1011	0x0046	0x0e11	0x4051	"cpqarray"	"DEC|DECchip 21554 [Compaq Smart Array Controller]"
 0x1011	0x0046	0x0e11	0x4058	"cpqarray"	"DEC|DECchip 21554 [Compaq Smart Array Controller]"
 0x1011	0x0046	0x103c	0x10c2	"aacraid"	"HP|NetRAID-4M"
-0x1011	0x0046	0x12d9	0x000a	"unknown"	"Digital Equipment Corporation|VoIP PCI Gateway"
-0x1011	0x0046	0x4c53	0x1050	"cpqarray"	"Digital Equipment Corporation|CT7 mainboard"
-0x1011	0x0046	0x4c53	0x1051	"cpqarray"	"Digital Equipment Corporation|CE7 mainboard"
+0x1011	0x0046	0x12d9	0x000a	"unknown"	"Digital Equipment Corp.|VoIP PCI Gateway"
+0x1011	0x0046	0x4c53	0x1050	"cpqarray"	"Digital Equipment Corp.|CT7 mainboard"
+0x1011	0x0046	0x4c53	0x1051	"cpqarray"	"Digital Equipment Corp.|CE7 mainboard"
+0x1011	0x0046	0x9005	0x0364	"aacraid"	"Adaptec|5400S"
 0x1011	0x0046	0x9005	0x0365	"aacraid"	"Adaptec|5400S"
 0x1011	0x0046	0x9005	0x1364	"aacraid"	"DEC|Dell PowerEdge RAID Controller 2"
 0x1011	0x0046	0x9005	0x1365	"aacraid"	"DEC|Dell PowerEdge RAID Controller 2"
-0x1011	0x0046	0xe4bf	0x1000	"unknown"	"Digital Equipment Corporation|CC8-1-BLUES"
+0x1011	0x0046	0xe4bf	0x1000	"unknown"	"Digital Equipment Corp.|CC8-1-BLUES"
 0x1011	0x0046	"cpqarray"	"DEC|DECchip 21554 [Compaq Smart Array Controller]"
-0x1011	0x1065	0x1069	0x0020	"DAC960"	"Digital Equipment Corporation|DAC960P / DAC1164P"
+0x1011	0x1065	0x1069	0x0020	"DAC960"	"Digital Equipment Corp.|DAC960P / DAC1164P"
 0x1011	0x1065	0x1244	0x0800	"c4"	"DEC|21285 Core Logic for SA-110 Microprocessor"
 0x1011	0x1065	0x1244	0x1100	"c4"	"DEC|21285 Core Logic for SA-110 Microprocessor"
 0x1011	0x1065	"DAC960"	"DEC|RAID Controller"
@@ -600,7 +675,8 @@
 0x1014	0x016e	"unknown"	"IBM|GXT4000P Graphics Adapter"
 0x1014	0x0170	"unknown"	"IBM|RC1000 / GT 1000"
 0x1014	0x017d	"unknown"	"IBM|GXT300P Graphics Adapter"
-0x1014	0x0180	"unknown"	"IBM|Snipe chipset SCSI controller"
+0x1014	0x0180	"ipr"	"IBM|Snipe chipset SCSI controller"
+0x1014	0x0188	"unknown"	"IBM|EADS-X PCI-X to PCI-X Bridge"
 0x1014	0x01a7	"unknown"	"International Business Machines Corp.|IBM 133 PCI-X Bridge R1.1"
 0x1014	0x01bd	"ips"	"IBM|ServeRAID controller"
 0x1014	0x01be	"ips"	"IBM|ServeRAID-4M"
@@ -616,10 +692,15 @@
 0x1014	0x021c	"unknown"	"IBM|GXT4500P Graphics Adapter"
 0x1014	0x022e	"ips"	"IBM|ServeRAID-4H"
 0x1014	0x0233	"unknown"	"IBM|GXT135P Graphics Adapter"
-0x1014	0x0246	"ibmphp"	""
+0x1014	0x0246	"ibmphp"	"IBM|"
 0x1014	0x0266	"unknown"	"IBM|PCI-X Dual Channel SCSI"
 0x1014	0x0268	"unknown"	"IBM|Gigabit Ethernet-SX Adapter (PCI-X)"
 0x1014	0x0269	"unknown"	"IBM|10/100/1000 Base-TX Ethernet Adapter (PCI-X)"
+0x1014	0x028c	0x1014	0x028d	"ipr"	"IBM|Dual Channel PCI-X DDR SAS RAID Adapter (572E)"
+0x1014	0x028c	0x1014	0x02be	"ipr"	"IBM|Dual Channel PCI-X DDR U320 SCSI RAID Adapter (571B)"
+0x1014	0x028c	0x1014	0x02c0	"ipr"	"IBM|Dual Channel PCI-X DDR U320 SCSI Adapter (571A)"
+0x1014	0x028c	0x1014	0x030d	"ipr"	"IBM|Dual Channel PCI-X DDR U320 SCSI Adapter (575B)"
+0x1014	0x028c	"unknown"	"IBM|Citrine chipset SCSI controller"
 0x1014	0x0295	"unknown"	"International Business Machines Corp.|NECSCE 11508082 IBM SurePOS Riser Card Function 0"
 0x1014	0x0297	"unknown"	"International Business Machines Corp.|NECSCE 11508082 IBM SurePOS Riser Card Function 1 (UARTs)"
 0x1014	0x0302	"unknown"	"IBM|XA-32 chipset [Summit]"
@@ -648,10 +729,10 @@
 0x101e	0x9040	"unknown"	"American Megatrends Inc|Multimedia card"
 0x101e	0x9060	"megaraid"	"AMI|MegaRAID 434 Ultra GT RAID Controller"
 0x101e	0x9063	"megaraid"	"AMI|MegaRAC"
-0x1022	0x1100	"unknown"	"Advanced Micro Devices|K8 NorthBridge"
-0x1022	0x1101	"unknown"	"Advanced Micro Devices|K8 NorthBridge"
-0x1022	0x1102	"unknown"	"Advanced Micro Devices|K8 NorthBridge"
-0x1022	0x1103	"unknown"	"Advanced Micro Devices|K8 NorthBridge"
+0x1022	0x1100	"unknown"	"Advanced Micro Devices|K8 [Athlon64/Opteron] HyperTransport Technology Configuration"
+0x1022	0x1101	"unknown"	"Advanced Micro Devices|K8 [Athlon64/Opteron] Address Map"
+0x1022	0x1102	"unknown"	"Advanced Micro Devices|K8 [Athlon64/Opteron] DRAM Controller"
+0x1022	0x1103	"unknown"	"Advanced Micro Devices|K8 [Athlon64/Opteron] Miscellaneous Control"
 0x1022	0x2000	"pcnet32"	"Advanced Micro Devices|79c970 [PCnet LANCE]"
 0x1022	0x2001	"pcnet32"	"Advanced Micro Devices|79c978 [HomePNA]"
 0x1022	0x2003	"unknown"	"Advanced Micro Devices|Am 1771 MBW [Alchemy]"
@@ -661,6 +742,8 @@
 0x1022	0x7004	"unknown"	"Advanced Micro Devices|AMD-751 CPU to PCI Bridge"
 0x1022	0x7006	"amd-k7-agp"	"Advanced Micro Devices|AMD-751 [Irongate] System Controller"
 0x1022	0x7007	"unknown"	"Advanced Micro Devices|AMD-751 PCI to PCI bridge"
+0x1022	0x700a	"unknown"	"Advanced Micro Devices|AMD-IGR4 AGP Host to PCI Bridge"
+0x1022	0x700b	"unknown"	"Advanced Micro Devices|AMD-IGR4 PCI to PCI Bridge"
 0x1022	0x700c	"amd-k7-agp"	"Advanced Micro Devices|AMD-762 CPU to PCI Bridge (SMP chipset)"
 0x1022	0x700d	"unknown"	"Advanced Micro Devices|AMD-762 CPU to PCI Bridge (AGP 4x)"
 0x1022	0x700e	"amd-k7-agp"	"Advanced Micro Devices|AMD-761 North Bridge"
@@ -671,24 +754,24 @@
 0x1022	0x7404	"usb-ohci"	"Advanced Micro Devices|AMD-755 PCI to USB Open Host Controller"
 0x1022	0x7408	"unknown"	"Advanced Micro Devices|AMD-756 PCI to ISA bridge"
 0x1022	0x7409	"unknown"	"Advanced Micro Devices|AMD-756 (Viper) Bus Master IDE controller"
-0x1022	0x740b	"unknown"	"Advanced Micro Devices|AMD-756 Power Management Controller"
+0x1022	0x740b	"i2c-amd756"	"Advanced Micro Devices|AMD-756 Power Management Controller"
 0x1022	0x740c	"usb-ohci"	"Advanced Micro Devices|AMD-756 PCI to USB Open Host Controller"
 0x1022	0x7410	"amd76xrom"	"Advanced Micro Devices|AMD-765 [Viper] ISA"
 0x1022	0x7411	"unknown"	"Advanced Micro Devices|AMD-765 [Viper] IDE"
 0x1022	0x7412	"unknown"	"Advanced Micro Devices|AMD-766 USB Controller"
-0x1022	0x7413	"unknown"	"Advanced Micro Devices|AMD-765 [Viper] ACPI"
+0x1022	0x7413	"i2c-amd756"	"Advanced Micro Devices|AMD-765 [Viper] ACPI"
 0x1022	0x7414	"usb-ohci"	"Advanced Micro Devices|AMD-765 [Viper] USB"
 0x1022	0x7440	"amd76xrom"	"Advanced Micro Devices|AMD-768 PCI to ISA Bridge"
 0x1022	0x7441	"unknown"	"Advanced Micro Devices|AMD-768 EIDE Controller"
-0x1022	0x7443	"amd7xx_tco"	"Advanced Micro Devices|AMD-768 ACPI Controller"
+0x1022	0x7443	"hw_random"	"Advanced Micro Devices|AMD-768 ACPI Controller"
 0x1022	0x7445	"i810_audio"	"Advanced Micro Devices|AMD-768 Audio"
-0x1022	0x7446	"unknown"	"Advanced Micro Devices|AMD-768 [Opus] MC97 Modem (Smart Link HAMR5600 compatible)"
+0x1022	0x7446	"slamr"	"Advanced Micro Devices|AMD-768 [Opus] MC97 Modem (Smart Link HAMR5600 compatible)"
 0x1022	0x7448	"unknown"	"Advanced Micro Devices|AMD-768 PCI to PCI Bridge?"
 0x1022	0x7449	"unknown"	"Advanced Micro Devices|AMD-768 USB Controller"
 0x1022	0x7450	"unknown"	"Advanced Micro Devices|AMD-8131 PCI-X Bridge"
 0x1022	0x7451	"unknown"	"Advanced Micro Devices|AMD-8131 PCI-X APIC"
 0x1022	0x7454	"amd64-agp"	"Advanced Micro Devices|AMD-8151 System Controller"
-0x1022	0x7455	"amd768_rng"	"Advanced Micro Devices|AMD-8151 AGP Bridge"
+0x1022	0x7455	"hw_random"	"Advanced Micro Devices|AMD-8151 AGP Bridge"
 0x1022	0x7460	"unknown"	"Advanced Micro Devices|AMD-8111 PCI"
 0x1022	0x7461	"usb-ohci"	"Advanced Micro Devices|AMD-8111 USB"
 0x1022	0x7462	"amd8111e"	"Advanced Micro Devices|AMD-8111 Ethernet"
@@ -696,8 +779,8 @@
 0x1022	0x7464	"usb-ohci"	"Advanced Micro Devices|AMD-8111 USB"
 0x1022	0x7468	"amd76xrom"	"Advanced Micro Devices|AMD-8111 LPC"
 0x1022	0x7469	"unknown"	"Advanced Micro Devices|AMD-8111 IDE"
-0x1022	0x746a	"unknown"	"Advanced Micro Devices|AMD-8111 SMBus 2.0"
-0x1022	0x746b	"amd768_rng"	"Advanced Micro Devices|AMD-8111 ACPI"
+0x1022	0x746a	"i2c-amd8111"	"Advanced Micro Devices|AMD-8111 SMBus 2.0"
+0x1022	0x746b	"hw_random"	"Advanced Micro Devices|AMD-8111 ACPI"
 0x1022	0x746d	"snd-intel8x0"	"Advanced Micro Devices|AMD-8111 AC97 Audio"
 0x1022	0x746e	"unknown"	"Advanced Micro Devices|AMD-8111 MC97 Modem"
 0x1022	0x756b	"unknown"	"Advanced Micro Devices|AMD-8111 ACPI"
@@ -775,6 +858,7 @@
 0x1025	0x1647	"ali-agp"	"Acer Incorporated [ALI]|M1647 [MaGiK1] PCI North Bridge"
 0x1025	0x1651	"ali-agp"	"Acer Incorporated [ALI]|M1651 PCI North Bridge"
 0x1025	0x1671	"ali-agp"	"Acer Incorporated [ALI]|M1671 PCI North Bridge"
+0x1025	0x1672	"unknown"	"Acer Incorporated [ALI]|Northbridge [CyberALADDiN-P4]"
 0x1025	0x3141	"unknown"	"Acer Incorporated [ALI]|M3141"
 0x1025	0x3143	"unknown"	"Acer Incorporated [ALI]|M3143"
 0x1025	0x3145	"unknown"	"Acer Incorporated [ALI]|M3145"
@@ -804,20 +888,25 @@
 0x1025	0x5451	"trident"	"Acer Incorporated [ALI]|ALI M5451 PCI AC-Link Controller Audio Device"
 0x1025	0x5453	"unknown"	"Acer Incorporated [ALI]|ALI M5453 PCI AC-Link Controller Modem Device"
 0x1025	0x7101	"unknown"	"Acer Incorporated [ALI]|ALI M7101 PCI PMU Power Management Controller"
-0x1028	0x0001	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 2/Si"
-0x1028	0x0002	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 3/Di"
-0x1028	0x0003	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 3/Si"
-0x1028	0x0004	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 3/Si"
-0x1028	0x0005	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 3/Di"
-0x1028	0x0006	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 3/Di"
-0x1028	0x0007	"drsc"	"Dell Computer Corporation|Remote Assitant Card 3"
-0x1028	0x0008	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 3/Di"
-0x1028	0x0009	"unknown"	"Dell Computer Corporation|BMC/SMIC device not present"
-0x1028	0x000a	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 3/Di"
-0x1028	0x000c	"racser"	"Dell Computer Corporation|Embedded Systems Management Device 4"
-0x1028	0x000d	"racser"	"Dell Computer Corporation|BMC/SMIC device"
-0x1028	0x000e	"megaraid"	"Dell Computer Corporation|PowerEdge RAID Controller"
-0x1028	0x000f	"megaraid"	"Dell Computer Corporation|PowerEdge RAID Controller 4/DI"
+0x1028	0x0001	"aacraid"	"Dell Computer Corp.|PowerEdge Expandable RAID Controller 2/Si"
+0x1028	0x0002	"aacraid"	"Dell Computer Corp.|PowerEdge Expandable RAID Controller 3/Di"
+0x1028	0x0003	"aacraid"	"Dell Computer Corp.|PowerEdge Expandable RAID Controller 3/Si"
+0x1028	0x0004	"aacraid"	"Dell Computer Corp.|PowerEdge Expandable RAID Controller 3/Si"
+0x1028	0x0005	"aacraid"	"Dell Computer Corp.|PowerEdge Expandable RAID Controller 3/Di"
+0x1028	0x0006	"aacraid"	"Dell Computer Corp.|PowerEdge Expandable RAID Controller 3/Di"
+0x1028	0x0007	"drsc"	"Dell Computer Corp.|Remote Assitant Card 3"
+0x1028	0x0008	"aacraid"	"Dell Computer Corp.|PowerEdge Expandable RAID Controller 3/Di"
+0x1028	0x0009	"unknown"	"Dell Computer Corp.|BMC/SMIC device not present"
+0x1028	0x000a	"aacraid"	"Dell Computer Corp.|PowerEdge Expandable RAID Controller 3/Di"
+0x1028	0x000c	"racser"	"Dell Computer Corp.|Embedded Systems Management Device 4"
+0x1028	0x000d	"racser"	"Dell Computer Corp.|BMC/SMIC device"
+0x1028	0x000e	"megaraid"	"Dell Computer Corp.|PowerEdge RAID Controller"
+0x1028	0x000f	"megaraid"	"Dell Computer Corp.|PowerEdge RAID Controller 4/DI"
+0x1028	0x0010	"unknown"	"Dell|Remote Access Card 4"
+0x1028	0x0011	"unknown"	"Dell|Remote Access Card 4 Daughter Card"
+0x1028	0x0012	"unknown"	"Dell|Remote Access Card 4 Daughter Card Virtual UART"
+0x1028	0x0013	"megaraid"	"Dell|PowerEdge Expandable RAID controller 4"
+0x1028	0x0014	"unknown"	"Dell|Remote Access Card 4 Daughter Card SMIC interface"
 0x102a	0x0000	"unknown"	"LSI Logic|HYDRA"
 0x102a	0x0010	"unknown"	"LSI Logic|ASPEN"
 0x102a	0x001f	"unknown"	"LSI Logic|AHA-2940U2/U2W /7890/7891 SCSI Controllers"
@@ -922,7 +1011,7 @@
 0x102b	0x1527	"unknown"	"Matrox|Fusion Plus G800 AGP"
 0x102b	0x2007	"Card:Matrox Mystique"	"Matrox|MGA Mistral"
 0x102b	0x2527	"Card:Matrox Millennium G550 DualHead"	"Matrox|MGA G550 AGP"
-0x102b	0x2537	"unknown"	"Matrox|MGA G650 AGP"
+0x102b	0x2537	"unknown"	"Matrox|MGA P750 AGP"
 0x102b	0x4536	"unknown"	"Matrox|VIA Framegrabber"
 0x102b	0x6573	"unknown"	"Matrox Graphics Inc|Shark 10/100 Multiport SwitchNIC"
 0x102b	0x80a0	"unknown"	"Matrox Electronic Systems Ltd.|RT.x10 Multimedia Device"
@@ -944,19 +1033,22 @@
 0x102c	0x0c30	"unknown"	"C&T|69030"
 0x102d	0x50dc	"unknown"	"Wyse Technology Inc.|3328 Audio"
 0x102f	0x0009	"unknown"	"Toshiba America|r4x00"
+0x102f	0x000a	"unknown"	"Toshiba America|TX3927 MIPS RISC PCI Controller"
 0x102f	0x0020	"unknown"	"Toshiba America|ATM Meteor 155"
 0x102f	0x0030	"tc35815"	"Toshiba America|NIC TC35815CF"
+0x102f	0x0031	"unknown"	"Toshiba America|TC35815CF PCI 10/100 Mbit Ethernet Controller with WOL"
 0x102f	0x0105	"unknown"	"Toshiba America|TC86C001 [goku-s] IDE"
 0x102f	0x0106	"unknown"	"Toshiba America|TC86C001 [goku-s] USB 1.1 Host"
 0x102f	0x0107	"unknown"	"Toshiba America|TC86C001 [goku-s] USB Device Controller"
 0x102f	0x0108	"unknown"	"Toshiba America|TC86C001 [goku-s] I2C/SIO/GPIO Controller"
 0x102f	0x0180	"unknown"	"Toshiba America|TX4927"
 0x102f	0x0181	"unknown"	"Toshiba America|TX4925 TX4925 Integrated MIPS Processor"
-0x1031	0x5601	"Server:SVGA"	"Miro|DC20 ASIC (ZR36050)"
+0x102f	0x0182	"unknown"	"Toshiba America|TX4937 MIPS RISC PCI Controller"
+0x1031	0x5601	"unknown"	"Miro|DC20 ASIC (ZR36050)"
 0x1031	0x5607	"unknown"	"Miro|Video I/O & motion JPEG compressor"
 0x1031	0x5631	"unknown"	"Miro|Media 3D"
 0x1031	0x6057	"unknown"	"Miro|MiroVideo DC10/DC30+"
-0x1033	0x0000	"unknown"	"NEC Corporation|Vr4181A USB Host or Function Control Unit"
+0x1033	0x0000	"unknown"	"NEC Corp.|Vr4181A USB Host or Function Control Unit"
 0x1033	0x0001	"unknown"	"NEC|PCI to 486-like bus Bridge"
 0x1033	0x0002	"unknown"	"NEC|PCI to VL98 Bridge"
 0x1033	0x0003	"unknown"	"NEC|ATM Controller"
@@ -966,34 +1058,34 @@
 0x1033	0x0007	"unknown"	"NEC|PCI to UX-Bus Bridge"
 0x1033	0x0008	"unknown"	"NEC Electronics Hong Kong|GUI Accelerator"
 0x1033	0x0009	"unknown"	"NEC Electronics Hong Kong|GUI Accelerator for 98"
-0x1033	0x0016	"unknown"	"NEC Corporation|PCI to VL Bridge"
+0x1033	0x0016	"unknown"	"NEC Corp.|PCI to VL Bridge"
 0x1033	0x001a	"unknown"	"NEC|[Nile II]"
-0x1033	0x001d	"unknown"	"NEC Corporation|uPD98405 NEASCOT-S20 ATM Integrated SAR Ctrlr"
+0x1033	0x001d	"unknown"	"NEC Corp.|uPD98405 NEASCOT-S20 ATM Integrated SAR Ctrlr"
 0x1033	0x0021	"unknown"	"NEC|Vrc4373 [Nile I]"
 0x1033	0x0029	"unknown"	"NEC|PowerVR PCX1"
 0x1033	0x002a	"unknown"	"NEC|PowerVR 3D"
-0x1033	0x002c	"unknown"	"NEC Corporation|Star Alpha 2"
-0x1033	0x002d	"unknown"	"NEC Corporation|PCI to C-bus Bridge"
+0x1033	0x002c	"unknown"	"NEC Corp.|Star Alpha 2"
+0x1033	0x002d	"unknown"	"NEC Corp.|PCI to C-bus Bridge"
 0x1033	0x0035	"usb-ohci"	"NEC|USB"
-0x1033	0x0036	"unknown"	"NEC Corporation|uPD98409 NEASCOT-S40C ATM Light SAR Controller"
-0x1033	0x003b	"unknown"	"NEC Corporation|PCI to C-bus Bridge"
+0x1033	0x0036	"unknown"	"NEC Corp.|uPD98409 NEASCOT-S40C ATM Light SAR Controller"
+0x1033	0x003b	"unknown"	"NEC Corp.|PCI to C-bus Bridge"
 0x1033	0x003e	"unknown"	"NEC|NAPCCARD Cardbus Controller"
 0x1033	0x0046	"unknown"	"NEC|PowerVR PCX2 [midas]"
-0x1033	0x005a	"unknown"	"NEC|Vrc5074 [Nile 4]"
+0x1033	0x005a	"8250_pci"	"NEC|Vrc5074 [Nile 4]"
 0x1033	0x0063	"unknown"	"NEC|Firewarden"
 0x1033	0x0067	"unknown"	"NEC|PowerVR Neon 250 Chipset"
 0x1033	0x0074	"unknown"	"NEC|56k Voice Modem"
 0x1033	0x009b	"unknown"	"NEC|Vrc5476"
 0x1033	0x00a5	"unknown"	"NEC|VRC4173"
 0x1033	0x00a6	"unknown"	"NEC|VRC5477 AC97"
-0x1033	0x00be	"unknown"	"NEC Corporation|VR4122 64-bit CPU with Northbridge"
-0x1033	0x00cd	"unknown"	"NEC Corporation|uPD72870 IEEE1394 1-Chip OHCI Host Controller"
-0x1033	0x00ce	"unknown"	"NEC Corporation|uPD72871/2 IEEE1394 1-Chip OHCI Host Controller"
-0x1033	0x00df	"unknown"	"NEC Corporation|Vr4131"
-0x1033	0x00e0	"ehci-hcd"	"NEC Corporation|PCI to USB Enhanced Host Controller"
-0x1033	0x00e7	"unknown"	"NEC Corporation|uPD72873 IEEE1394 OHCI 1.1 2-port PHY-Link Ctrlr"
-0x1033	0x00f2	"unknown"	"NEC Corporation|uPD72874 IEEE1394 OHCI 1.1 3-port PHY-Link Ctrlr"
-0x1033	0x00f3	"unknown"	"NEC Corporation|uPD6113x Multimedia Decoder/Processor [EMMA2]"
+0x1033	0x00be	"unknown"	"NEC Corp.|VR4122 64-bit CPU with Northbridge"
+0x1033	0x00cd	"unknown"	"NEC Corp.|uPD72870 IEEE1394 1-Chip OHCI Host Controller"
+0x1033	0x00ce	"unknown"	"NEC Corp.|uPD72871/2 IEEE1394 1-Chip OHCI Host Controller"
+0x1033	0x00df	"unknown"	"NEC Corp.|Vr4131"
+0x1033	0x00e0	"ehci-hcd"	"NEC Corp.|PCI to USB Enhanced Host Controller"
+0x1033	0x00e7	"unknown"	"NEC Corp.|uPD72873 IEEE1394 OHCI 1.1 2-port PHY-Link Ctrlr"
+0x1033	0x00f2	"unknown"	"NEC Corp.|uPD72874 IEEE1394 OHCI 1.1 3-port PHY-Link Ctrlr"
+0x1033	0x00f3	"unknown"	"NEC Corp.|uPD6113x Multimedia Decoder/Processor [EMMA2]"
 0x1033	0x010c	"unknown"	"NEC|VR7701"
 0x1036	0x0000	"fdomain"	"Future Domain|TMC-18C30 [36C70]"
 0x1039	0x0000	"unknown"	"Silicon Integrated System| "
@@ -1002,12 +1094,14 @@
 0x1039	0x0003	"unknown"	"Silicon Integrated System|SiS648FX Virtual PCI to PCI Bridge (AGP)"
 0x1039	0x0005	"unknown"	"Silicon Integrated Systems [SiS]|Pentium Chipset"
 0x1039	0x0006	"unknown"	"Silicon Integrated Systems [SiS]|85C501/2/3"
-0x1039	0x0008	"unknown"	"Silicon Integrated Systems [SiS]|85C503/5513"
+0x1039	0x0008	"i2c-sis5595"	"Silicon Integrated Systems [SiS]|85C503/5513"
 0x1039	0x0009	"unknown"	"Silicon Integrated Systems [SiS]|ACPI"
-0x1039	0x0016	"unknown"	"Silicon Integrated System|SiS961/962 SMBus Controller"
-0x1039	0x0018	"unknown"	"Silicon Integrated Systems [SiS]|SiS85C503/5513 (LPC Bridge)"
-0x1039	0x0190	"sis190"	""
-0x1039	0x0200	"Card:SiS 5598"	"Silicon Integrated Systems [SiS]|5597/5598 VGA"
+0x1039	0x0016	"i2c-sis96x"	"Silicon Integrated System|SiS961/962 SMBus Controller"
+0x1039	0x0018	"i2c-sis630"	"Silicon Integrated Systems [SiS]|SiS85C503/5513 (LPC Bridge)"
+0x1039	0x0180	"sata_sis"	"Silicon Integrated Systems [SiS]|RAID bus controller 180 SATA/PATA  [SiS]"
+0x1039	0x0181	"sata_sis"	"Silicon Integrated Systems [SiS]|"
+0x1039	0x0190	"sis190"	"Silicon Integrated Systems [SiS]|"
+0x1039	0x0200	"Card:SiS 5598"	"Silicon Integrated Systems [SiS]|5597/5598/6326 VGA"
 0x1039	0x0204	"unknown"	"Silicon Integrated Systems [SiS]|82C204"
 0x1039	0x0205	"Card:SiS SG86C205"	"Silicon Integrated Systems [SiS]|SG86C205"
 0x1039	0x0215	"Card:SiS SG86C215"	"SIS|SG86C215"
@@ -1016,8 +1110,8 @@
 0x1039	0x0305	"unknown"	"Silicon Integrated System|SiS305 2D/3D/Video/DVD Accelerator"
 0x1039	0x0310	"Card:SiS"	"Silicon Integrated Systems [SiS]|SiS315H PCI/AGP VGA Display Adapter"
 0x1039	0x0315	"Card:SiS"	"Silicon Integrated System|SiS 315"
-0x1039	0x0325	"unknown"	"Silicon Integrated System|SiS325 2D/3D Accelerator"
-0x1039	0x0330	"unknown"	"Silicon Integrated System|SiS330 Xabre 2D/3D Accelerator"
+0x1039	0x0325	"sisfb"	"Silicon Integrated System|SiS325 2D/3D Accelerator"
+0x1039	0x0330	"sisfb"	"Silicon Integrated System|SiS330 Xabre 2D/3D Accelerator"
 0x1039	0x0406	"unknown"	"Silicon Integrated Systems [SiS]|85C501/2"
 0x1039	0x0496	"unknown"	"Silicon Integrated Systems [SiS]|85C496"
 0x1039	0x0530	"sis-agp"	"Silicon Integrated Systems [SiS]|530 Host"
@@ -1070,7 +1164,7 @@
 0x1039	0x3602	"unknown"	"Silicon Integrated Systems [SiS]|83C602"
 0x1039	0x5107	"unknown"	"Silicon Integrated Systems [SiS]|5107"
 0x1039	0x5300	"Card:SiS 540"	"Silicon Integrated Systems [SiS]|SiS540 PCI Display Adapter"
-0x1039	0x5315	"unknown"	"Silicon Integrated System|SiS550/1/2 GUI Accelerator"
+0x1039	0x5315	"sisfb"	"Silicon Integrated System|SiS550/1/2 GUI Accelerator"
 0x1039	0x5401	"unknown"	"Silicon Integrated Systems [SiS]|486 PCI Chipset"
 0x1039	0x5511	"unknown"	"Silicon Integrated Systems [SiS]|5511/5512"
 0x1039	0x5513	"unknown"	"Silicon Integrated Systems [SiS]|5513 [IDE]"
@@ -1101,7 +1195,7 @@
 0x1039	0x7005	"unknown"	"Silicon Integrated System|SiS551/2 Memory Stick Controller"
 0x1039	0x7007	"ohci1394"	"Silicon Integrated Systems [SiS]|OHCI Compliant FireWire Controller"
 0x1039	0x7012	"snd-intel8x0"	"Silicon Integrated Systems [SiS]|SiS7012 PCI Audio Accelerator"
-0x1039	0x7013	"unknown"	"Silicon Integrated System|SiS7013 56k Modem"
+0x1039	0x7013	"slamr"	"Silicon Integrated System|SiS7013 56k Modem"
 0x1039	0x7015	"unknown"	"Silicon Integrated System|SiS550/1/2 Software Audio"
 0x1039	0x7016	"sis900"	"Silicon Integrated Systems [SiS]|SiS900 10/100 Ethernet"
 0x1039	0x7018	"snd-trident"	"Silicon Integrated Systems [SiS]|7018 PCI Audio"
@@ -1120,7 +1214,7 @@
 0x103c	0x1040	"hp100"	"HP|J2973A DeskDirect 10BaseT NIC"
 0x103c	0x1041	"unknown"	"HP|J2585B DeskDirect 10/100 NIC"
 0x103c	0x1042	"hp100"	"HP|J2970A DeskDirect 10BaseT/2 NIC"
-0x103c	0x1048	"unknown"	"Hewlett-Packard Company|SAS"
+0x103c	0x1048	"8250_pci"	"Hewlett-Packard Company|SAS"
 0x103c	0x1049	"unknown"	"Hewlett-Packard Company|DIVA1"
 0x103c	0x104a	"unknown"	"Hewlett-Packard Company|DIVA2"
 0x103c	0x104b	"unknown"	"Hewlett-Packard Company|SP2"
@@ -1142,7 +1236,7 @@
 0x103c	0x122e	"unknown"	"Hewlett-Packard Company|zx1 Local Bus Adapter"
 0x103c	0x1279	"Card:ATI Rage 128"	"HP|Rage128 Ultra TR"
 0x103c	0x127c	"unknown"	"HP|sx1000 I/O Controller"
-0x103c	0x1290	"unknown"	"Hewlett-Packard Company|Auxiliary Diva Serial Port"
+0x103c	0x1290	"8250_pci"	"Hewlett-Packard Company|Auxiliary Diva Serial Port"
 0x103c	0x2910	"unknown"	"HP|E2910A"
 0x103c	0x2920	"unknown"	"Hewlett-Packard Company|Fast Host Interface"
 0x103c	0x2924	"unknown"	"Hewlett-Packard Company|E2924A PCI Host Interface Adapter"
@@ -1150,8 +1244,9 @@
 0x103c	0x2926	"unknown"	"Hewlett-Packard Company|E2926A 64 bit PCI Bus Exerciser and Analyzer"
 0x103c	0x2927	"unknown"	"Hewlett-Packard Company|E2927A 64 Bit, 66/50MHz PCI Analyzer & Exerciser"
 0x103c	0x2940	"unknown"	"Hewlett-Packard Company|E2940A 64 bit, 66/50MHz CompactPCI Analyzer&Exerciser"
-0x1042	0x1000	"unknown"	"Micron|FDC 37C665"
-0x1042	0x1001	"unknown"	"Micron|37C922"
+0x103c	0x3210	"cciss"	""
+0x1042	0x1000	"rz1000"	"Micron|FDC 37C665"
+0x1042	0x1001	"rz1000"	"Micron|37C922"
 0x1042	0x3000	"unknown"	"Micron|Samurai_0"
 0x1042	0x3010	"unknown"	"Micron|Samurai_1"
 0x1042	0x3020	"unknown"	"Micron|Samurai_IDE"
@@ -1166,6 +1261,7 @@
 0x1043	0x4057	"Card:NVIDIA GeForce3 (generic)"	"Asustek Computer, Inc.|V8200 GeForce 3"
 0x1043	0x8043	"unknown"	"Asustek Computer, Inc.|v8240 PAL 128M [P4T] Motherboard"
 0x1043	0x807b	"unknown"	"Asustek Computer, Inc.|v9280/TD [Geforce4 TI4200 8X With TV-Out and DVI]"
+0x1043	0x80bb	"unknown"	"ASUSTeK Computer Inc.|v9180 Magic/T [GeForce4 MX440 AGP 8x 64MB TV-out]"
 0x1043	0x80f3	"snd-intel8x0"	"Asustek Computer Inc.|ASUS ICH5/AD1985"
 0x1044	0x1012	"unknown"	"Distributed Processing Tech|Domino RAID Engine"
 0x1044	0xa400	"eata"	"Distributed Processing Tech|SmartCache/Raid I-IV Controller"
@@ -1213,7 +1309,7 @@
 0x104a	0x021b	"unknown"	"ST Microelectronics|STPC Consumer-II ISA Bridge"
 0x104a	0x0228	"unknown"	"ST Microelectronics|STPC Atlas IDE Controller"
 0x104a	0x0230	"unknown"	"ST Microelectronics|STPC Atlas USB Controller"
-0x104a	0x0500	"ADSL:unicorn"	"Bewan Systems|PCI ADSL Modem [model] from"
+0x104a	0x0500	"ADSL:unicorn"	"Bewan Systems|ST70137 [Unicorn] ADSL DMT Transceiver"
 0x104a	0x0564	"unknown"	"STMicroelectronics|STPC Client Northbridge"
 0x104a	0x0981	"tulip"	"ST Microelectronics| Ethernet Controller"
 0x104a	0x1746	"unknown"	"SGS Thomson|STG 1764X"
@@ -1245,6 +1341,8 @@
 0x104c	0x8026	"ohci1394"	"Texas Instruments|TSB43AB21 IEEE-1394 Controller (PHY/Link) 1394a-2000"
 0x104c	0x8027	"ohci1394"	"Texas Instruments|PCI4451 OHCI-Lynx IEEE 1394 Controller"
 0x104c	0x8029	"unknown"	"Texas Instruments|PCI4510 IEEE-1394 Controller"
+0x104c	0x802e	"unknown"	"Texas Instruments|PCI7x20 1394a-2000 OHCI Two-Port PHY/Link-Layer Controller"
+0x104c	0x8201	"unknown"	"Texas Instruments|PCI1620 Firmware Loading Function"
 0x104c	0x8204	"unknown"	"Texas Instruments|4610, 4515, 4610FM TI UltraMedia Firmware Loader Device"
 0x104c	0x8400	"acx100_pci"	"Texas Instruments|USR2210 22Mbps Wireless PC Card"
 0x104c	0x8401	"acx100_pci"	"Texas Instruments|ACX 100 22Mbps Wireless Interface"
@@ -1285,7 +1383,7 @@
 0x104c	0xac51	"yenta_socket"	"Texas Instruments|PCI1420 PC Card Controller"
 0x104c	0xac52	"yenta_socket"	"Texas Instruments|PCI1451 PC card Cardbus Controller"
 0x104c	0xac53	"unknown"	"Texas Instruments|PCI1421 PC card Cardbus Controller"
-0x104c	0xac54	"unknown"	"Texas Instruments|PCI1620 PCCard CardBus Controller w/UltraMedia"
+0x104c	0xac54	"yenta_socket"	"Texas Instruments|PCI1620 PCCard CardBus Controller w/UltraMedia"
 0x104c	0xac55	"yenta_socket"	"Texas Instruments|PCI1250 PC card Cardbus Controller"
 0x104c	0xac56	"yenta_socket"	"Texas Instruments|PCI1510 PCCard CardBus Controller"
 0x104c	0xac57	"unknown"	"Texas Instruments|PCI1530 PCCard CardBus Controller"
@@ -1294,14 +1392,14 @@
 0x104c	0xac5a	"unknown"	"Texas Instruments|PCI1610 PCCard CardBus Controller w/UltraMedia"
 0x104c	0xac60	"unknown"	"Texas Instruments|PCI2040 PCI to DSP Bridge Controller"
 0x104c	0xac8d	"unknown"	"Texas Instruments|PCI 7620"
-0x104c	0xac8e	"unknown"	"Texas Instruments|PCI7420 CardBus Controller"
+0x104c	0xac8e	"yenta_socket"	"Texas Instruments|PCI7420 CardBus Controller"
 0x104c	0xac8f	"unknown"	"Texas Instruments|PCI7420 Flash Media Controller"
 0x104c	0xfe00	"unknown"	"Texas Instruments|FireWire Host Controller"
 0x104c	0xfe03	"unknown"	"Texas Instruments|12C01A FireWire Host Controller"
-0x104d	0x8009	"unknown"	"Sony Corporation|CXD1947Q i.LINK Controller"
-0x104d	0x8039	"ohci1394"	"Sony Corporation|CXD3222 iLINK Controller"
-0x104d	0x8056	"Hcf:www.linmodems.org"	"Sony Corporation|Rockwell HCF 56K modem"
-0x104d	0x808a	"unknown"	"Sony Corporation|Memory Stick Controller"
+0x104d	0x8009	"unknown"	"Sony Corp.|CXD1947Q i.LINK Controller"
+0x104d	0x8039	"ohci1394"	"Sony Corp.|CXD3222 iLINK Controller"
+0x104d	0x8056	"Hcf:www.linmodems.org"	"Sony Corp.|Rockwell HCF 56K modem"
+0x104d	0x808a	"unknown"	"Sony Corp.|Memory Stick Controller"
 0x104e	0x0017	"unknown"	"Oak Technology, Inc|OTI-64017"
 0x104e	0x0107	"Card:Paradise Accelerator Value"	"Oak Technology, Inc|OTI-107 [Spitfire]"
 0x104e	0x0109	"unknown"	"Oak Technology, Inc|Video Adapter"
@@ -1320,6 +1418,7 @@
 0x1050	0x0940	"ne2k-pci"	"Winbond Electronics Corp|W89C940"
 0x1050	0x5a5a	"ne2k-pci"	"Winbond Electronics Corp|W89C940F"
 0x1050	0x6692	"ISDN:hisax,type=36"	"Winbond Electronics Corp|W6692 ISDN Adapter"
+0x1050	0x9921	"unknown"	"Winbond Electronics Corp|W99200F MPEG-1 Video Encoder"
 0x1050	0x9922	"unknown"	"Winbond Electronics Corp|W9922PF ISDN Controller"
 0x1050	0x9960	"unknown"	"Winbond Electronics Corp|W9960CF Video Codec"
 0x1050	0x9961	"unknown"	"Winbond Electronics Corp|W9961CF H.263/H.261 Video Codec"
@@ -1333,22 +1432,26 @@
 0x1055	0x0810	"unknown"	"EFAR Microsystems|486 Host Bridge"
 0x1055	0x0922	"unknown"	"EFAR Microsystems|Pentium Host Bridge"
 0x1055	0x0926	"unknown"	"EFAR Microsystems|PCI to ISA Bridge"
-0x1055	0x9130	"unknown"	"EFAR Microsystems|EIDE Controller"
+0x1055	0x9130	"slc90e66"	"EFAR Microsystems|EIDE Controller"
+0x1055	0x9178	"slamr"	"EFAR Microsystems|Modem (SmartLink)"
 0x1055	0x9460	"unknown"	"EFAR Microsystems|PCI to ISA Bridge"
 0x1055	0x9461	"unknown"	"Standard Microsystems Corp.|SLC90E66 Victory66 UDMA EIDE Controller"
 0x1055	0x9462	"usb-ohci"	"EFAR Microsystems|USB Universal Host Controller [OHCI]"
-0x1055	0x9463	"unknown"	"EFAR Microsystems|Power Management Controller [Bridge]"
+0x1055	0x9463	"i2c-piix4"	"EFAR Microsystems|Power Management Controller [Bridge]"
 0x1057	0x0000	"unknown"	"Motorola| "
 0x1057	0x0001	"unknown"	"Motorola|MPC105 [Eagle]"
 0x1057	0x0002	"unknown"	"Motorola|MPC106 [Grackle]"
 0x1057	0x0003	"snd-mixart"	"Motorola|MPC107 PCI Bridge/Memory Controller for PowerPC"
 0x1057	0x0004	"unknown"	"Motorola|MPC107 PCI Bridge/Memory Controller for PPC"
 0x1057	0x0006	"unknown"	"Motorola|MPC8245 [Unity]"
+0x1057	0x0008	"unknown"	"Motorola|MPC8540"
+0x1057	0x0009	"unknown"	"Motorola|MPC8560"
 0x1057	0x0100	"unknown"	"Motorola|MC145575 [HFC-PCI]"
 0x1057	0x0431	"unknown"	"Motorola|KTI829c 100VG"
 0x1057	0x1801	"snd-gina20"	"Motorola|Audio I/O Controller (MIDI)"
 0x1057	0x1802	"unknown"	"Motorola|DSP56305 24-Bit Digital Signal Processor"
 0x1057	0x18c0	"unknown"	"Motorola|MPC8265A/MPC8266"
+0x1057	0x18c1	"unknown"	"Motorola|MPC8271/MPC8272"
 0x1057	0x3410	"snd-gina20"	"Motorola|"
 0x1057	0x3421	"unknown"	"Motorola|56IVMR/Phoenix 56ISM Modem"
 0x1057	0x4801	"unknown"	"Motorola|Raven"
@@ -1364,15 +1467,18 @@
 0x1057	0x5608	"unknown"	"Motorola|56k dps PCI Modem"
 0x1057	0x5803	"unknown"	"Motorola|MPC5200 32-Bit Embedded PowerPC Processor"
 0x1057	0x6400	"unknown"	"Motorola|MPC190 Security Processor (S1 family, encryption)"
+0x1057	0x6405	"unknown"	"Motorola|MPC184 Security Processor (S1 family)"
 0x105a	0x0d30	"unknown"	"Promise Technology, Inc.|20265"
 0x105a	0x0d38	"unknown"	"Promise Technology|PDC20263 FastTrak66 EIDE Controller"
-0x105a	0x1275	"unknown"	"Promise Technology|PDC20275 EIDE Controller"
+0x105a	0x1275	"pdc202xx_new"	"Promise Technology|PDC20275 EIDE Controller"
 0x105a	0x3318	"sata_promise"	"Promise Technology|PDC20318 FastTrak SATA150 TX4 Controller"
 0x105a	0x3319	"sata_promise"	"Promise Technology|PDC20319 FastTrak SATA150 TX4 Controller"
 0x105a	0x3371	"sata_promise"	"Promise Technology|PDC20371 FastTrak SATA150 TX2plus Controller"
 0x105a	0x3373	"sata_promise"	"Promise Technology|PDC20376 FastTrak 378 Controller"
 0x105a	0x3375	"sata_promise"	"Promise Technology|PDC20375 FastTrak SATA150 TX2plus Controller"
 0x105a	0x3376	"sata_promise"	"Promise Technology|PDC20376 FastTrak 376 Controller"
+0x105a	0x3574	"unknown"	"Promise Technology, Inc.|PDC20579 SATAII 150 IDE Controller"
+0x105a	0x3d18	"unknown"	"Promise Technology, Inc.|PDC20518 SATAII 150 IDE Controller"
 0x105a	0x4d30	"unknown"	"Promise Technology, Inc.|20267"
 0x105a	0x4d33	"unknown"	"Promise Technology, Inc.|20246"
 0x105a	0x4d38	"unknown"	"Promise Technology, Inc.|20262 (Ultra66)"
@@ -1383,7 +1489,7 @@
 0x105a	0x6268	"unknown"	"Promise Technology|PDC20268R FastTrak100 TX2/TX4 EIDE controller"
 0x105a	0x6269	"unknown"	"Promise Technology, Inc.|PDC20271"
 0x105a	0x6621	"unknown"	"Promise Technology, Inc.|PDC20621 [SX4000] 4 Channel IDE RAID Controller"
-0x105a	0x6622	"sata_promise"	"Promise Technology|PDC2037X FastTrak Controller"
+0x105a	0x6622	"sata_sx4"	"Promise Technology|PDC2037X FastTrak Controller"
 0x105a	0x6626	"unknown"	"Promise Technology, Inc.|PDC20618 Ultra 618"
 0x105a	0x6629	"unknown"	"Promise Technology|FastTrak TX4000 Controller"
 0x105a	0x7275	"unknown"	"Promise Technology, Inc.|PDC20277"
@@ -1431,14 +1537,14 @@
 0x1067	0x0304	"unknown"	"Mitsubishi Electric|AccelGALAXY A2100 [OEM Evans & Sutherland]"
 0x1067	0x0308	"unknown"	"Mitsubishi Electric|Tornado 3000 [OEM Evans & Sutherland]"
 0x1067	0x1002	"unknown"	"Mitsubishi Electric|VG500 [VolumePro Volume Rendering Accelerator]"
-0x1069	0x0001	"DAC960"	"Mylex Corporation|DAC960P"
-0x1069	0x0002	"DAC960"	"Mylex Corporation|DAC960PD"
-0x1069	0x0010	"DAC960"	"Mylex Corporation|DAC960PX"
-0x1069	0x0020	"DAC960"	"Mylex Corporation|DAC960 V5"
-0x1069	0x0050	"DAC960"	"Mylex Corporation|Raid Adapter (DAC960)"
-0x1069	0xb166	"unknown"	"Mylex Corporation|Gemstone chipset SCSI controller"
-0x1069	0xba55	"DAC960"	"Mylex Corporation|eXtremeRAID support Device"
-0x1069	0xba56	"DAC960"	"Mylex Corporation|eXtremeRAID 2000/3000 support Device"
+0x1069	0x0001	"DAC960"	"Mylex Corp.|DAC960P"
+0x1069	0x0002	"DAC960"	"Mylex Corp.|DAC960PD"
+0x1069	0x0010	"DAC960"	"Mylex Corp.|DAC960PX"
+0x1069	0x0020	"DAC960"	"Mylex Corp.|DAC960 V5"
+0x1069	0x0050	"DAC960"	"Mylex Corp.|Raid Adapter (DAC960)"
+0x1069	0xb166	"ipr"	"Mylex Corp.|Gemstone chipset SCSI controller"
+0x1069	0xba55	"DAC960"	"Mylex Corp.|eXtremeRAID support Device"
+0x1069	0xba56	"DAC960"	"Mylex Corp.|eXtremeRAID 2000/3000 support Device"
 0x106b	0x0001	"unknown"	"Apple Computer Inc.|Bandit PowerPC Host-PCI Bridge"
 0x106b	0x0002	"unknown"	"Apple Computer Inc.|Grand Central I/O Controller"
 0x106b	0x0003	"unknown"	"Apple Computer Inc.|Control Video"
@@ -1449,7 +1555,7 @@
 0x106b	0x000e	"unknown"	"Apple Computer Inc.|Hydra Mac I/O Controller"
 0x106b	0x0010	"unknown"	"Apple Computer Inc.|Heathrow Mac I/O Controller"
 0x106b	0x0017	"unknown"	"Apple Computer Inc.|Paddington Mac I/O Controller"
-0x106b	0x0018	"unknown"	"Apple Computer Inc.|UniNorth FireWire Controller"
+0x106b	0x0018	"ohci1394"	"Apple Computer Inc.|UniNorth FireWire Controller"
 0x106b	0x0019	"usb-ohci"	"Apple Computer Inc.|Keylargo USB Controller"
 0x106b	0x001e	"unknown"	"Apple Computer Inc.|UniNorth Host-PCI Bridge"
 0x106b	0x001f	"unknown"	"Apple Computer Inc.|UniNorth Host-PCI Bridge"
@@ -1458,15 +1564,15 @@
 0x106b	0x0022	"unknown"	"Apple Computer Inc.|Keylargo Mac I/O Controller"
 0x106b	0x0024	"sungem"	"Apple Computer Inc.|GMAC Ethernet controller"
 0x106b	0x0025	"unknown"	"Apple Computer Inc.|Pangea Mac I/O Controller"
-0x106b	0x0026	"unknown"	"Apple Computer Inc.|KeyLargo/Pangea USB"
+0x106b	0x0026	"usb-ohci"	"Apple Computer Inc.|KeyLargo/Pangea USB"
 0x106b	0x0027	"uninorth-agp"	"Apple Computer Inc.|Pangea AGP Interface"
 0x106b	0x0028	"unknown"	"Apple Computer Inc.|Pangea Host-PCI bridge"
 0x106b	0x0029	"unknown"	"Apple Computer Inc.|Pangea Host-PCI bridge"
 0x106b	0x002d	"uninorth-agp"	"Apple Computer Inc.|UniNorth 1.5 AGP"
 0x106b	0x002e	"unknown"	"Apple Computer Inc.|UniNorth 1.5 PCI"
 0x106b	0x002f	"unknown"	"Apple Computer Inc.|UniNorth 1.5 Internal PCI"
-0x106b	0x0030	"unknown"	"Apple Computer Inc.|UniNorth/Pangea FireWire"
-0x106b	0x0031	"unknown"	"Apple Computer Inc.|UniNorth 2 FireWire"
+0x106b	0x0030	"ohci1394"	"Apple Computer Inc.|UniNorth/Pangea FireWire"
+0x106b	0x0031	"ohci1394"	"Apple Computer Inc.|UniNorth 2 FireWire"
 0x106b	0x0032	"sungem"	"Apple Computer Inc.|UniNorth 2 GMAC (Sun GEM)"
 0x106b	0x0033	"unknown"	"Apple Computer Inc.|UniNorth 2 ATA/100"
 0x106b	0x0034	"uninorth-agp"	"Apple Computer Inc.|UniNorth 2 AGP"
@@ -1474,10 +1580,10 @@
 0x106b	0x0036	"unknown"	"Apple Computer Inc.|UniNorth 2 Internal PCI"
 0x106b	0x003b	"unknown"	"Apple Computer Inc.|UniNorth/Intrepid ATA/100"
 0x106b	0x003e	"unknown"	"Apple Computer Inc.|KeyLargo/Intrepid Mac I/O"
-0x106b	0x003f	"unknown"	"Apple Computer Inc.|KeyLargo/Intrepid USB"
-0x106b	0x0040	"unknown"	"Apple Computer Inc.|K2 KeyLargo USB"
+0x106b	0x003f	"usb-ohci"	"Apple Computer Inc.|KeyLargo/Intrepid USB"
+0x106b	0x0040	"usb-ohci"	"Apple Computer Inc.|K2 KeyLargo USB"
 0x106b	0x0041	"unknown"	"Apple Computer Inc.|K2 KeyLargo Mac/IO"
-0x106b	0x0042	"unknown"	"Apple Computer Inc.|K2 FireWire"
+0x106b	0x0042	"ohci1394"	"Apple Computer Inc.|K2 FireWire"
 0x106b	0x0043	"unknown"	"Apple Computer Inc.|K2 ATA/100"
 0x106b	0x0045	"unknown"	"Apple Computer Inc.|K2 HT-PCI Bridge"
 0x106b	0x0046	"unknown"	"Apple Computer Inc.|K2 HT-PCI Bridge"
@@ -1486,7 +1592,7 @@
 0x106b	0x0049	"unknown"	"Apple Computer Inc.|K2 HT-PCI Bridge"
 0x106b	0x004b	"unknown"	"Apple Computer Inc.|U3 AGP"
 0x106b	0x004c	"sungem"	"Apple Computer Inc.|"
-0x106b	0x1645	"unknown"	"Apple Computer Inc.|Tigon3 Gigabit Ethernet NIC (BCM5701)"
+0x106b	0x1645	"tg3_ng"	"Apple Computer Inc.|Tigon3 Gigabit Ethernet NIC (BCM5701)"
 0x106c	0x8801	"unknown"	"Hyundai Electronics America|Dual Pentium ISA/PCI Motherboard"
 0x106c	0x8802	"unknown"	"Hyundai Electronics America|PowerPC ISA/PCI Motherboard"
 0x106c	0x8803	"unknown"	"Hyundai Electronics America|Dual Window Graphics Accelerator"
@@ -1506,7 +1612,7 @@
 0x1073	0x0010	"ymfpci"	"Yamaha Corp|YMF-744B [DS-1S Audio Controller]"
 0x1073	0x0012	"snd-ymfpci"	"Yamaha Corp|YMF-754 [DS-1E Audio Controller]"
 0x1073	0x0020	"ymfpci"	"Yamaha Corp|DS-1 Audio"
-0x1073	0x1000	"unknown"	"Yamaha Corporation|SW1000XG Sound system"
+0x1073	0x1000	"unknown"	"Yamaha Corp.|SW1000XG Sound system"
 0x1073	0x2000	"unknown"	"Yamaha Corp|DS2416 Digital Mixing Card"
 0x1074	0x4e78	"unknown"	"NexGen Microsystems|82c500/1"
 0x1077	0x1016	"qla1280"	"Q Logic|QLA10160"
@@ -1517,57 +1623,59 @@
 0x1077	0x1240	"qla1280"	"Q Logic|QLA1240"
 0x1077	0x1280	"qla1280"	"Q Logic|QLA1280"
 0x1077	0x2020	"qlogicisp"	"Q Logic|ISP2020A"
-0x1077	0x2100	"qla2200"	"Q Logic|QLA2100"
+0x1077	0x2100	"qla2100"	"Q Logic|QLA2100"
 0x1077	0x2200	"qla2200"	"Q Logic|QLA2200"
 0x1077	0x2300	"qla2300"	"Q Logic|QLA2300"
 0x1077	0x2312	"qla2300"	"Q Logic|QLA2312"
-0x1077	0x2322	"qla2322"	"Q Logic|"
-0x1077	0x4000	"unknown"	"QLogic Corporation| "
-0x1077	0x4010	"unknown"	"QLogic Corporation| "
-0x1077	0x6312	"qla6312"	"QLogic Corporation| "
-0x1077	0x6322	"qla6322"	"QLogic Corporation| "
-0x1078	0x0000	"Card:MediaGX"	"Cyrix Corporation|5510 [Grappa]"
-0x1078	0x0001	"Card:MediaGX"	"Cyrix Corporation|PCI Master [MEDIAGX]"
-0x1078	0x0002	"Card:MediaGX"	"Cyrix Corporation|5520 [Cognac]"
-0x1078	0x0100	"unknown"	"Cyrix Corporation|5530 Legacy [Kahlua]"
-0x1078	0x0101	"unknown"	"Cyrix Corporation|5530 SMI [Kahlua]"
-0x1078	0x0102	"unknown"	"Cyrix Corporation|5530 IDE [Kahlua]"
-0x1078	0x0103	"kahlua"	"Cyrix Corporation|5530 Audio [Kahlua]"
-0x1078	0x0104	"Card:MediaGX"	"Cyrix Corporation|5530 Video [Kahlua]"
-0x1078	0x0400	"unknown"	"Cyrix Corporation|ZFMicro CPU to PCI Bridge"
-0x1078	0x0401	"unknown"	"Cyrix Corporation|ZFMicro Power Management Controller"
-0x1078	0x0402	"unknown"	"Cyrix Corporation|ZFMicro IDE Controller"
-0x1078	0x0403	"unknown"	"Cyrix Corporation|ZFMicro Expansion Bus"
+0x1077	0x2322	"qla2322"	"Q Logic|QLA2322"
+0x1077	0x4000	"unknown"	"QLogic Corp.| "
+0x1077	0x4010	"unknown"	"QLogic Corp.| "
+0x1077	0x6312	"qla6312"	"QLogic Corp.|QLA6312"
+0x1077	0x6322	"qla6322"	"QLogic Corp.|QLA6312"
+0x1078	0x0000	"Card:MediaGX"	"Cyrix Corp.|5510 [Grappa]"
+0x1078	0x0001	"Card:MediaGX"	"Cyrix Corp.|PCI Master [MEDIAGX]"
+0x1078	0x0002	"Card:MediaGX"	"Cyrix Corp.|5520 [Cognac]"
+0x1078	0x0100	"unknown"	"Cyrix Corp.|5530 Legacy [Kahlua]"
+0x1078	0x0101	"unknown"	"Cyrix Corp.|5530 SMI [Kahlua]"
+0x1078	0x0102	"cs5530"	"Cyrix Corp.|5530 IDE [Kahlua]"
+0x1078	0x0103	"kahlua"	"Cyrix Corp.|5530 Audio [Kahlua]"
+0x1078	0x0104	"Card:MediaGX"	"Cyrix Corp.|5530 Video [Kahlua]"
+0x1078	0x0400	"unknown"	"Cyrix Corp.|ZFMicro CPU to PCI Bridge"
+0x1078	0x0401	"unknown"	"Cyrix Corp.|ZFMicro Power Management Controller"
+0x1078	0x0402	"unknown"	"Cyrix Corp.|ZFMicro IDE Controller"
+0x1078	0x0403	"unknown"	"Cyrix Corp.|ZFMicro Expansion Bus"
 0x1079	0x0d01	"unknown"	"I-Bus| "
 0x107d	0x0000	"unknown"	"LeadTek Research Inc.|P86C850"
-0x107e	0x0001	"unknown"	"Interphase Corporation|ATM Interface Card"
-0x107e	0x0002	"unknown"	"Interphase Corporation|100 VG AnyLan Controller"
-0x107e	0x0004	"iph5526"	"Interphase Corporation|5526"
-0x107e	0x0005	"iph5526"	"Interphase Corporation|55x6"
-0x107e	0x0008	"iphase"	"Interphase Corporation|155 Mbit ATM Controller"
-0x107e	0x0009	"iphase"	"Interphase Corporation|5525/5575 ATM Adapter (155 Mbit) [Atlantic]"
-0x107e	0x9003	"unknown"	"Interphase Corporation|5535-4P-BRI-ST"
-0x107e	0x9007	"unknown"	"Interphase Corporation|5535-4P-BRI-U"
-0x107e	0x9008	"unknown"	"Interphase Corporation|5535-1P-SR"
-0x107e	0x900c	"unknown"	"Interphase Corporation|5535-1P-SR-ST"
-0x107e	0x900e	"unknown"	"Interphase Corporation|5535-1P-SR-U"
-0x107e	0x9011	"unknown"	"Interphase Corporation|5535-1P-PRI"
-0x107e	0x9013	"unknown"	"Interphase Corporation|5535-2P-PRI"
-0x107e	0x9023	"unknown"	"Interphase Corporation|5535-4P-BRI-ST"
-0x107e	0x9027	"unknown"	"Interphase Corporation|5536-4P-BRI-U"
-0x107e	0x9031	"unknown"	"Interphase Corporation|5535-1P-PRI"
-0x107e	0x9033	"unknown"	"Interphase Corporation|5536-2P-PRI"
-0x107e	0x9060	"unknown"	"Interphase Corporation|6535 CompactPCI T1/E1/J1Communications Ctrlr"
-0x107e	0x9070	"unknown"	"Interphase Corporation|4538 PMC T1/E1/J1 Communications Controller"
-0x107e	0x9080	"unknown"	"Interphase Corporation|4532-002/005 PMC ATM Over OC-3/STM-1 Comm Controller"
-0x107e	0x9081	"unknown"	"Interphase Corporation|4532-001/004 PMC ATM Over OC-3/STM-1 Comm Controller"
-0x107e	0x9082	"unknown"	"Interphase Corporation|4532-000/003 PMC ATM Over OC-3/STM-1 Comm Controller"
-0x107e	0x9090	"unknown"	"Interphase Corporation|4531S-000/001 PMC ATM Over T3/E3 Communications Ctrlr"
-0x107e	0x90a0	"unknown"	"Interphase Corporation|4539 PMC Quad T1/E1/J1 Communications Ctrlr"
+0x107d	0x2134	"unknown"	"LeadTek Research Inc.|WinFast 3D S320 II"
+0x107d	0x2971	"unknown"	"LeadTek Research Inc.|[GeForce FX 5900] WinFast A350 TDH MyViVo"
+0x107e	0x0001	"unknown"	"Interphase Corp.|ATM Interface Card"
+0x107e	0x0002	"unknown"	"Interphase Corp.|100 VG AnyLan Controller"
+0x107e	0x0004	"iph5526"	"Interphase Corp.|5526"
+0x107e	0x0005	"iph5526"	"Interphase Corp.|55x6"
+0x107e	0x0008	"iphase"	"Interphase Corp.|155 Mbit ATM Controller"
+0x107e	0x0009	"iphase"	"Interphase Corp.|5525/5575 ATM Adapter (155 Mbit) [Atlantic]"
+0x107e	0x9003	"unknown"	"Interphase Corp.|5535-4P-BRI-ST"
+0x107e	0x9007	"unknown"	"Interphase Corp.|5535-4P-BRI-U"
+0x107e	0x9008	"unknown"	"Interphase Corp.|5535-1P-SR"
+0x107e	0x900c	"unknown"	"Interphase Corp.|5535-1P-SR-ST"
+0x107e	0x900e	"unknown"	"Interphase Corp.|5535-1P-SR-U"
+0x107e	0x9011	"unknown"	"Interphase Corp.|5535-1P-PRI"
+0x107e	0x9013	"unknown"	"Interphase Corp.|5535-2P-PRI"
+0x107e	0x9023	"unknown"	"Interphase Corp.|5535-4P-BRI-ST"
+0x107e	0x9027	"unknown"	"Interphase Corp.|5536-4P-BRI-U"
+0x107e	0x9031	"unknown"	"Interphase Corp.|5535-1P-PRI"
+0x107e	0x9033	"unknown"	"Interphase Corp.|5536-2P-PRI"
+0x107e	0x9060	"unknown"	"Interphase Corp.|6535 CompactPCI T1/E1/J1Communications Ctrlr"
+0x107e	0x9070	"unknown"	"Interphase Corp.|4538 PMC T1/E1/J1 Communications Controller"
+0x107e	0x9080	"unknown"	"Interphase Corp.|4532-002/005 PMC ATM Over OC-3/STM-1 Comm Controller"
+0x107e	0x9081	"unknown"	"Interphase Corp.|4532-001/004 PMC ATM Over OC-3/STM-1 Comm Controller"
+0x107e	0x9082	"unknown"	"Interphase Corp.|4532-000/003 PMC ATM Over OC-3/STM-1 Comm Controller"
+0x107e	0x9090	"unknown"	"Interphase Corp.|4531S-000/001 PMC ATM Over T3/E3 Communications Ctrlr"
+0x107e	0x90a0	"unknown"	"Interphase Corp.|4539 PMC Quad T1/E1/J1 Communications Ctrlr"
 0x107f	0x0802	"unknown"	"Data Technology|SL82C105"
 0x107f	0x0803	"unknown"	"Data Technology Corp (DTC)|EIDE Bus Master Controller"
 0x107f	0x0806	"unknown"	"Data Technology Corp (DTC)|EIDE Controller"
-0x107f	0x1138	"unknown"	"Data Technology Corporation (DTC)|High Speed Parallel Port"
+0x107f	0x1138	"unknown"	"Data Technology Corp. (DTC)|High Speed Parallel Port"
 0x107f	0x2015	"unknown"	"Data Technology Corp (DTC)|EIDE Controller"
 0x1080	0x0600	"unknown"	"Contaq Microsystems|82C599"
 0x1080	0xc691	"unknown"	"Contaq Microsystems|Cypress CY82C691"
@@ -1611,13 +1719,15 @@
 0x108e	0xa000	"unknown"	"Sun|Ultra IIi PCI"
 0x108e	0xa001	"unknown"	"Sun|Ultra IIe"
 0x108e	0xa801	"unknown"	"Sun|Tomatillo PCI Bus Module"
-0x1091	0x0020	"unknown"	"Intergraph Corporation|3D graphics processor"
-0x1091	0x0021	"unknown"	"Intergraph Corporation|3D graphics processor w/Texturing"
-0x1091	0x0040	"unknown"	"Intergraph Corporation|3D graphics frame buffer"
-0x1091	0x0041	"unknown"	"Intergraph Corporation|3D graphics frame buffer"
-0x1091	0x0060	"unknown"	"Intergraph Corporation|Proprietary bus bridge"
-0x1091	0x00e4	"unknown"	"Intergraph Corporation|Powerstorm 4D50T"
-0x1091	0x0720	"unknown"	"Intergraph Corporation|Motion JPEG codec"
+0x1091	0x0020	"unknown"	"Intergraph Corp.|3D graphics processor"
+0x1091	0x0021	"unknown"	"Intergraph Corp.|3D graphics processor w/Texturing"
+0x1091	0x0040	"unknown"	"Intergraph Corp.|3D graphics frame buffer"
+0x1091	0x0041	"unknown"	"Intergraph Corp.|3D graphics frame buffer"
+0x1091	0x0060	"unknown"	"Intergraph Corp.|Proprietary bus bridge"
+0x1091	0x00e4	"unknown"	"Intergraph Corp.|Powerstorm 4D50T"
+0x1091	0x0720	"unknown"	"Intergraph Corp.|Motion JPEG codec"
+0x1091	0x07a0	"unknown"	"Intergraph Corp.|Sun Expert3D-Lite Graphics Accelerator"
+0x1091	0x1091	"unknown"	"Intergraph Corp.|Sun Expert3D Graphics Accelerator"
 0x1092	0x00a0	"Card:Diamond SpeedStar Pro SE (CL-GD5430/5434)"	"Diamond Multimedia Systems|Speedstar Pro SE"
 0x1092	0x00a8	"Card:Diamond SpeedStar 64"	"Diamond Multimedia Systems|Speedstar 64"
 0x1092	0x0550	"Card:Diamond Viper 550"	"Diamond|Viper 550"
@@ -1659,9 +1769,14 @@
 0x1093	0x1340	"unknown"	"National Instruments|PCI-6033E Multifunction Data Acquisition Card"
 0x1093	0x1350	"unknown"	"National Instruments|PCI-6071E"
 0x1093	0x1360	"unknown"	"National Instruments| "
+0x1093	0x14e0	"unknown"	"National Instruments|PCI-6110"
+0x1093	0x14f0	"unknown"	"National Instruments|PCI-6111"
 0x1093	0x17d0	"unknown"	"National Instruments|PCI-6503"
+0x1093	0x1870	"unknown"	"National Instruments|PCI-6713"
+0x1093	0x1880	"unknown"	"National Instruments|PCI-6711"
 0x1093	0x18b0	"unknown"	"National Instruments| "
 0x1093	0x2410	"unknown"	"National Instruments|PCI-6733"
+0x1093	0x2890	"unknown"	"National Instruments|PCI-6036E"
 0x1093	0x2a60	"unknown"	"National Instruments|PCI-6023E"
 0x1093	0x2a70	"unknown"	"National Instruments|PCI-6024E Multifunction Data Acquisition Card"
 0x1093	0x2a80	"unknown"	"National Instruments|PCI-6025E Multifunction Data Acquisition Card"
@@ -1699,35 +1814,37 @@
 0x1095	0x0680	"unknown"	"CMD Technology Inc.|PCI-680 UltraATA/133 EIDE Controller"
 0x1095	0x3112	"sata_sil"	"Silicon Image|Sil3112A Serial ATA"
 0x1095	0x3114	"sata_sil"	"Silicon Image|Sil3114A Serial ATA"
+0x1095	0x3124	"unknown"	"Silicon Image, Inc. (formerly CMD Technology Inc)|SiI 3124 PCI-X Serial ATA Controller"
 0x1095	0x3512	"sata_sil"	"Silicon Image|Sil3512A Serial ATA"
 0x1097	0x0038	"unknown"	"Appian Technology (ETMA)|EIDE Controller"
 0x1097	0x3d32	"unknown"	"Appian Graphics|Jeronimo 2000 AGP"
-0x1098	0x0001	"Server:SVGA"	"Quantum Designs|QD-8500"
-0x1098	0x0002	"Server:SVGA"	"Quantum Designs|QD-8580"
-0x109e	0x0350	"bttv"	"Brooktree Corporation|Bt848 TV with DMA push"
-0x109e	0x0351	"bttv"	"Brooktree Corporation|Bt849A Video capture"
-0x109e	0x0369	"bttv"	"Brooktree Corporation|Bt878 Video Capture"
-0x109e	0x036c	"bttv"	"Brooktree Corporation|Bt879(??) Video Capture"
-0x109e	0x036e	"bttv"	"Brooktree Corporation|Bt878"
-0x109e	0x036f	"bttv"	"Brooktree Corporation|Bt879"
-0x109e	0x0370	"bttv"	"Brooktree Corporation|Bt880 Video Capture"
-0x109e	0x0878	"btaudio"	"Brooktree Corporation|Bt878"
-0x109e	0x0879	"btaudio"	"Brooktree Corporation|Bt879 Video Capture (Audio Section)"
-0x109e	0x0880	"btaudio"	"Brooktree Corporation|Bt880 Video Capture (Audio Section)"
-0x109e	0x2115	"unknown"	"Brooktree Corporation|BtV 2115 Mediastream controller"
-0x109e	0x2125	"unknown"	"Brooktree Corporation|BtV 2125 Mediastream controller"
-0x109e	0x2164	"unknown"	"Brooktree Corporation|BtV 2164"
-0x109e	0x2165	"unknown"	"Brooktree Corporation|BtV 2165"
-0x109e	0x8230	"unknown"	"Brooktree Corporation|Bt8230 ATM Segment/Reassembly Ctrlr (SRC)"
-0x109e	0x8472	"unknown"	"Brooktree Corporation|Bt8472"
-0x109e	0x8474	"unknown"	"Brooktree Corporation|Bt8474"
+0x1098	0x0001	"unknown"	"Quantum Designs|QD-8500"
+0x1098	0x0002	"unknown"	"Quantum Designs|QD-8580"
+0x109e	0x0350	"bttv"	"Brooktree Corp.|Bt848 TV with DMA push"
+0x109e	0x0351	"bttv"	"Brooktree Corp.|Bt849A Video capture"
+0x109e	0x0369	"bttv"	"Brooktree Corp.|Bt878 Video Capture"
+0x109e	0x036c	"bttv"	"Brooktree Corp.|Bt879(??) Video Capture"
+0x109e	0x036e	"bttv"	"Brooktree Corp.|Bt878"
+0x109e	0x036f	"bttv"	"Brooktree Corp.|Bt879"
+0x109e	0x0370	"bttv"	"Brooktree Corp.|Bt880 Video Capture"
+0x109e	0x0878	"bt878"	"Brooktree Corp.|Bt878"
+0x109e	0x0879	"btaudio"	"Brooktree Corp.|Bt879 Video Capture (Audio Section)"
+0x109e	0x0880	"btaudio"	"Brooktree Corp.|Bt880 Video Capture (Audio Section)"
+0x109e	0x2115	"unknown"	"Brooktree Corp.|BtV 2115 Mediastream controller"
+0x109e	0x2125	"unknown"	"Brooktree Corp.|BtV 2125 Mediastream controller"
+0x109e	0x2164	"unknown"	"Brooktree Corp.|BtV 2164"
+0x109e	0x2165	"unknown"	"Brooktree Corp.|BtV 2165"
+0x109e	0x8230	"unknown"	"Brooktree Corp.|Bt8230 ATM Segment/Reassembly Ctrlr (SRC)"
+0x109e	0x8472	"unknown"	"Brooktree Corp.|Bt8472"
+0x109e	0x8474	"unknown"	"Brooktree Corp.|Bt8474"
 0x10a4	0x0000	"unknown"	"Globe Manufacturing Sales| "
-0x10a5	0x3052	"unknown"	"Smart Link Ltd.|SmartPCI562 56K Modem"
+0x10a5	0x3052	"slamr"	"Smart Link Ltd.|SmartPCI562 56K Modem"
 0x10a5	0x5449	"unknown"	"Smart Link Ltd.|SmartPCI561 modem"
+0x10a5	0x5459	"slamr"	"Smart Link Ltd.|modem"
 0x10a8	0x0000	"Card:STB Horizon"	"Sierra Semiconductor|STB Horizon 64"
 0x10a9	0x0001	"unknown"	"Silicon Graphics, Inc.|Crosstalk to PCI Bridge"
 0x10a9	0x0002	"unknown"	"Silicon Graphics, Inc.|Linc I/O controller"
-0x10a9	0x0003	"unknown"	"Silicon Graphics|IOC3"
+0x10a9	0x0003	"8250_pci"	"Silicon Graphics|IOC3"
 0x10a9	0x0004	"unknown"	"Silicon Graphics, Inc.|O2 MACE"
 0x10a9	0x0005	"unknown"	"Silicon Graphics|RAD Audio"
 0x10a9	0x0006	"unknown"	"Silicon Graphics, Inc.|HPCEX"
@@ -1775,10 +1892,10 @@
 0x10b5	0x0960	"unknown"	"PLX Technology|PCI 9080RDK-960 PCI Reference Design Kit for PCI 9080"
 0x10b5	0x1030	"ISDN:hisax,type=34"	"PLX Technology, Inc.|Gazel ISDN Adapter"
 0x10b5	0x1054	"ISDN:hisax,type=34"	"PLX Technology, Inc.|Gazel ISDN Adapter"
-0x10b5	0x1076	"unknown"	"PLX Technology, Inc.|VScom 800 8 port serial adaptor"
-0x10b5	0x1077	"unknown"	"PLX Technology, Inc.|VScom 400 4 port serial adaptor"
+0x10b5	0x1076	"8250_pci"	"PLX Technology, Inc.|VScom 800 8 port serial adaptor"
+0x10b5	0x1077	"8250_pci"	"PLX Technology, Inc.|VScom 400 4 port serial adaptor"
 0x10b5	0x1078	"unknown"	"PLX Technology|PCI 9050 Vision Systems VScom PCI-210"
-0x10b5	0x1103	"unknown"	"PLX Technology, Inc.|SPcom 200"
+0x10b5	0x1103	"8250_pci"	"PLX Technology, Inc.|SPcom 200"
 0x10b5	0x1146	"unknown"	"PLX Technology|PCI 9050 Vision Systems VScom PCI-010S"
 0x10b5	0x1147	"unknown"	"PLX Technology|PCI 9050 Vision Systems VScom PCI-020S"
 0x10b5	0x1151	"ISDN:hisax,type=34"	"PLX Technology, Inc.|Gazel ISDN Adapter"
@@ -1799,9 +1916,21 @@
 0x10b5	0x2bd0	"ISDN:hisax,type=34"	"PLX Technology, Inc.|Gazel ISDN Adapter"
 0x10b5	0x9030	"snd-vx222"	"PLX Technology|PCI 9030 PCI SMARTarget I/O Accelerator"
 0x10b5	0x9036	"unknown"	"PLX Technology, Inc.|9036"
+0x10b5	0x9050	0x10b5	0x1067	"snd-vx222"	"PLX Technology, Inc.|IXXAT CAN i165"
 0x10b5	0x9050	0x10b5	0x2036	"snd-vx222"	"PLX Technology, Inc.|SatPak GPS"
+0x10b5	0x9050	0x10b5	0x2221	"snd-vx222"	"PLX Technology, Inc.|Alpermann+Velte PCL PCI LV: Timecode Reader Board"
 0x10b5	0x9050	0x10b5	0x2273	"snd-vx222"	"PLX Technology, Inc.|SH-ARC SoHard ARCnet card"
+0x10b5	0x9050	0x10b5	0x2431	"snd-vx222"	"PLX Technology, Inc.|Alpermann+Velte PCL PCI D: Timecode Reader Board"
+0x10b5	0x9050	0x10b5	0x2905	"snd-vx222"	"PLX Technology, Inc.|Alpermann+Velte PCI TS: Time Synchronisation Board"
 0x10b5	0x9050	0x10b5	0x9050	"snd-vx222"	"PLX Technology, Inc.|MP9050"
+0x10b5	0x9050	0x11a9	0x5334	"8250_pci"	""
+0x10b5	0x9050	0x124d	0xf001	"8250_pci"	""
+0x10b5	0x9050	0x124d	0xf010	"8250_pci"	""
+0x10b5	0x9050	0x12e0	0x0011	"8250_pci"	""
+0x10b5	0x9050	0x12e0	0x0021	"8250_pci"	""
+0x10b5	0x9050	0x12e0	0x0031	"8250_pci"	""
+0x10b5	0x9050	0x12e0	0x0041	"8250_pci"	""
+0x10b5	0x9050	0x1498	0x0362	"snd-vx222"	"PLX Technology, Inc.|TPMC866 8 Channel Serial Card"
 0x10b5	0x9050	0x1522	0x0001	"snd-vx222"	"PLX Technology, Inc.|RockForce 4 Port V.90 Data/Fax/Voice Modem"
 0x10b5	0x9050	0x1522	0x0002	"snd-vx222"	"PLX Technology, Inc.|RockForce 2 Port V.90 Data/Fax/Voice Modem"
 0x10b5	0x9050	0x1522	0x0003	"snd-vx222"	"PLX Technology, Inc.|RockForce 6 Port V.90 Data/Fax/Voice Modem"
@@ -1842,7 +1971,7 @@
 0x10b5	0x906d	"snd-korg1212"	"Korg 1212 IO"
 0x10b5	0x906e	"unknown"	"PLX Technology, Inc.|9060ES"
 0x10b5	0x9080	"unknown"	"PLX Technology, Inc.|9080"
-0x10b5	0xa001	"unknown"	"PLX Technology, Inc.|Gtek Serial"
+0x10b5	0xa001	"8250_pci"	"PLX Technology, Inc.|Gtek Serial"
 0x10b5	0xbb04	"unknown"	"PLX Technology, Inc.|B&B 3PCIOSD1A Isolated PCI Serial"
 0x10b5	0xc001	"unknown"	"PLX Technology, Inc.|GTEK Cyclone 16/32 port serial adaptor"
 0x10b6	0x0001	"unknown"	"Madge Networks|Smart 16/4 PCI Ringnode"
@@ -1858,74 +1987,75 @@
 0x10b6	0x1000	"unknown"	"Madge Networks|Collage 25 ATM Adapter"
 0x10b6	0x1001	"unknown"	"Madge Networks|Collage 155 ATM Server Adapter"
 0x10b6	0x1002	"unknown"	"Madge Networks|Ambassador ATM Adapter"
-0x10b7	0x0001	"acenic"	"3Com Corporation|3c985 1000BaseSX"
-0x10b7	0x0910	"unknown"	"3Com Corporation|3C910-A01"
-0x10b7	0x1000	"unknown"	"3Com Corporation|3C905CX-TXNM 3COM 3C905CX-TXNM with 40-0664-003 ASIC"
-0x10b7	0x1006	"unknown"	"3Com Corporation|MINI PCI type 3B Data Fax Modem"
-0x10b7	0x1007	"unknown"	"3Com Corporation|3C556 V.90 Mini-PCI Modem"
-0x10b7	0x1201	"3c59x"	"3Com Corporation|"
-0x10b7	0x1202	"3c59x"	"3Com Corporation|"
-0x10b7	0x1700	"sk98lin"	"3Com Corporation|3C940 10/100/1000 LAN"
-0x10b7	0x1f1f	"unknown"	"3Com Corporation|3CRWE777A AirConnect Wireless LAN PCI Card"
-0x10b7	0x3390	"tmspci"	"3Com Corporation|Token Link Velocity"
-0x10b7	0x3590	"3c559"	"3Com Corporation|3c359 TokenLink Velocity XL"
-0x10b7	0x4500	"3c59x"	"3Com Corporation|3c450 Cyclone/unknown"
-0x10b7	0x5055	"3c59x"	"3Com Corporation|3c555 [Megahertz] 10/100 LAN CardBus"
-0x10b7	0x5057	"3c59x"	"3Com Corporation|3c575 [Megahertz] 10/100 LAN CardBus"
-0x10b7	0x5157	"3c59x"	"3Com Corporation|3c575 [Megahertz] 10/100 LAN CardBus"
-0x10b7	0x5257	"3c59x"	"3Com Corporation|3c575 Fast EtherLink XL"
-0x10b7	0x5900	"3c59x"	"3Com Corporation|3c590 10BaseT [Vortex]"
-0x10b7	0x5920	"3c59x"	"3Com Corporation|3c592 EISA 10mbps Demon/Vortex"
-0x10b7	0x5950	"3c59x"	"3Com Corporation|3c595 100BaseTX [Vortex]"
-0x10b7	0x5951	"3c59x"	"3Com Corporation|3c595 100BaseT4 [Vortex]"
-0x10b7	0x5952	"3c59x"	"3Com Corporation|3c595 100Base-MII [Vortex]"
-0x10b7	0x5970	"3c59x"	"3Com Corporation|3c597 EISA Fast Demon/Vortex"
-0x10b7	0x5b57	"3c59x"	"3Com Corporation|3C595 Megahertz 10/100 LAN CardBus"
-0x10b7	0x6000	"unknown"	"3Com Corporation|3CRSHPW796 [OfficeConnect Wireless CardBus]"
-0x10b7	0x6001	"prism54"	"3Com Corporation|3cRWE154G72 Wireless LAN adapter"
-0x10b7	0x6055	"3c59x"	"3Com Corporation|3c556 10/100 Mini-PCI Adapter [Cyclone]"
-0x10b7	0x6056	"3c59x"	"3Com Corporation|3C556 10/100 Mini PCI Fast Ethernet Adapter"
-0x10b7	0x6550	"3c59x"	"3Com Corporation|3c575 [Megahertz] 10/100 LAN CardBus"
-0x10b7	0x6560	"3c59x"	"3Com Corporation|3c575 [Megahertz] 10/100 LAN CardBus"
-0x10b7	0x6561	"3c59x"	"3Com Corporation|FEM656 10/100 LAN+56K Modem CardBus PC Card"
-0x10b7	0x6562	"3c59x"	"3Com Corporation|3CCFEM656 Cyclone CardBus"
-0x10b7	0x6563	"3c59x"	"3Com Corporation|FEM656B 10/100 LAN+56K Modem CardBus PC Card"
-0x10b7	0x6564	"3c59x"	"3Com Corporation|3CCFEM656 Cyclone CardBus"
-0x10b7	0x6565	"unknown"	"3Com Corporation|3CCFEM656C Global 10/100 Fast Ethernet+56K Modem"
-0x10b7	0x7646	"3c59x"	"3Com Corporation|3cSOHO100-TX [Hurricane]"
-0x10b7	0x7770	"orinoco_plx"	"3Com Corporation|802.11b Wireless Ethernet Adapter"
-0x10b7	0x7940	"3c59x"	"3Com Corporation|3c803 FDDILink DAS Controller"
-0x10b7	0x7980	"3c59x"	"3Com Corporation|3c803 FDDILink UTP Controller"
-0x10b7	0x7990	"3c59x"	"3Com Corporation|3c804 FDDILink SAS Controller"
-0x10b7	0x8811	"unknown"	"3Com Corporation|Token ring"
-0x10b7	0x9000	"3c59x"	"3Com Corporation|3c900 10BaseT [Boomerang]"
-0x10b7	0x9001	"3c59x"	"3Com Corporation|3c900 Combo [Boomerang]"
-0x10b7	0x9004	"3c59x"	"3Com Corporation|3c900B-TPO [Etherlink XL TPO]"
-0x10b7	0x9005	"3c59x"	"3Com Corporation|3c900B-Combo [Etherlink XL Combo]"
-0x10b7	0x9006	"3c59x"	"3Com Corporation|3c900B-TPC [Etherlink XL TPC]"
-0x10b7	0x900a	"3c59x"	"3Com Corporation|3c900B-FL [Etherlink XL FL]"
-0x10b7	0x9050	"3c59x"	"3Com Corporation|3c905 100BaseTX [Boomerang]"
-0x10b7	0x9051	"3c59x"	"3Com Corporation|3c905 100BaseT4 [Boomerang]"
-0x10b7	0x9055	"3c59x"	"3Com Corporation|3c905B 100BaseTX [Cyclone]"
-0x10b7	0x9056	"3c59x"	"3Com Corporation|3c905B-T4 [Fast EtherLink XL 10/100]"
-0x10b7	0x9058	"3c59x"	"3Com Corporation|3c905B-Combo [Deluxe Etherlink XL 10/100]"
-0x10b7	0x905a	"3c59x"	"3Com Corporation|3c905B-FX [Fast Etherlink XL FX 10/100]"
-0x10b7	0x9200	"3c59x"	"3Com Corporation|3c905C-TX [Fast Etherlink]"
-0x10b7	0x9201	"3c90x"	"3Com Corporation|3c920 Tornado"
-0x10b7	0x9202	"unknown"	"3Com Corporation|3Com 3C920B-EMB-WNM Integrated Fast Ethernet Controller"
-0x10b7	0x9210	"3c59x"	"3Com Corporation|3C920B-EMB-WNM Integrated Fast Ethernet Controller"
-0x10b7	0x9300	"tulip"	"3Com Corporation|3CSOHO100B-TX  [910-A01]"
-0x10b7	0x9800	"3c59x"	"3Com Corporation|3c980-TX [Fast Etherlink XL Server Adapter]"
-0x10b7	0x9805	"3c59x"	"3Com Corporation|3c980-TX [Fast Etherlink XL Server Adapter]"
-0x10b7	0x9900	"typhoon"	"3Com Corporation|3C990-TX Typhoon"
-0x10b7	0x9902	"typhoon"	"3Com Corporation|3CR990-TX-95 EtherLink 10/100 PCI with 3XP Processor"
-0x10b7	0x9903	"typhoon"	"3Com Corporation|3CR990-TX-97 EtherLink 10/100 PCI with 3XP Processor"
-0x10b7	0x9904	"typhoon"	"3Com Corporation|3CR990-TX-M EtherLink 10/100 PCI with 3XP Processor"
-0x10b7	0x9905	"typhoon"	"3Com Corporation|3CR990-FX-95/97/95 [Typhon Fiber]"
-0x10b7	0x9908	"typhoon"	"3Com Corporation|3CR990SVR95 EtherLink 10/100 Server PCI with 3XP"
-0x10b7	0x9909	"typhoon"	"3Com Corporation|3CR990SVR97 EtherLink 10/100 Server PCI with 3XP"
-0x10b7	0x990a	"typhoon"	"3Com Corporation|3C990BSVR EtherLink 10/100 Server PCI with 3XP"
-0x10b7	0x990b	"typhoon"	"3Com Corporation|3C990SVR [Typhoon Server]"
+0x10b7	0x0001	"acenic"	"3Com Corp.|3c985 1000BaseSX"
+0x10b7	0x0013	"ath_pci"	"3Com Corp.|"
+0x10b7	0x0910	"unknown"	"3Com Corp.|3C910-A01"
+0x10b7	0x1000	"unknown"	"3Com Corp.|3C905CX-TXNM 3COM 3C905CX-TXNM with 40-0664-003 ASIC"
+0x10b7	0x1006	"unknown"	"3Com Corp.|MINI PCI type 3B Data Fax Modem"
+0x10b7	0x1007	"unknown"	"3Com Corp.|3C556 V.90 Mini-PCI Modem"
+0x10b7	0x1201	"3c59x"	"3Com Corp.|"
+0x10b7	0x1202	"3c59x"	"3Com Corp.|"
+0x10b7	0x1700	"sk98lin"	"3Com Corp.|3C940 10/100/1000 LAN"
+0x10b7	0x1f1f	"unknown"	"3Com Corp.|3CRWE777A AirConnect Wireless LAN PCI Card"
+0x10b7	0x3390	"tmspci"	"3Com Corp.|Token Link Velocity"
+0x10b7	0x3590	"3c359"	"3Com Corp.|3c359 TokenLink Velocity XL"
+0x10b7	0x4500	"3c59x"	"3Com Corp.|3c450 Cyclone/unknown"
+0x10b7	0x5055	"3c59x"	"3Com Corp.|3c555 [Megahertz] 10/100 LAN CardBus"
+0x10b7	0x5057	"3c59x"	"3Com Corp.|3c575 [Megahertz] 10/100 LAN CardBus"
+0x10b7	0x5157	"3c59x"	"3Com Corp.|3c575 [Megahertz] 10/100 LAN CardBus"
+0x10b7	0x5257	"3c59x"	"3Com Corp.|3c575 Fast EtherLink XL"
+0x10b7	0x5900	"3c59x"	"3Com Corp.|3c590 10BaseT [Vortex]"
+0x10b7	0x5920	"3c59x"	"3Com Corp.|3c592 EISA 10mbps Demon/Vortex"
+0x10b7	0x5950	"3c59x"	"3Com Corp.|3c595 100BaseTX [Vortex]"
+0x10b7	0x5951	"3c59x"	"3Com Corp.|3c595 100BaseT4 [Vortex]"
+0x10b7	0x5952	"3c59x"	"3Com Corp.|3c595 100Base-MII [Vortex]"
+0x10b7	0x5970	"3c59x"	"3Com Corp.|3c597 EISA Fast Demon/Vortex"
+0x10b7	0x5b57	"3c59x"	"3Com Corp.|3C595 Megahertz 10/100 LAN CardBus"
+0x10b7	0x6000	"unknown"	"3Com Corp.|3CRSHPW796 [OfficeConnect Wireless CardBus]"
+0x10b7	0x6001	"prism54"	"3Com Corp.|3cRWE154G72 Wireless LAN adapter"
+0x10b7	0x6055	"3c59x"	"3Com Corp.|3c556 10/100 Mini-PCI Adapter [Cyclone]"
+0x10b7	0x6056	"3c59x"	"3Com Corp.|3C556 10/100 Mini PCI Fast Ethernet Adapter"
+0x10b7	0x6550	"3c59x"	"3Com Corp.|3c575 [Megahertz] 10/100 LAN CardBus"
+0x10b7	0x6560	"3c59x"	"3Com Corp.|3c575 [Megahertz] 10/100 LAN CardBus"
+0x10b7	0x6561	"3c59x"	"3Com Corp.|FEM656 10/100 LAN+56K Modem CardBus PC Card"
+0x10b7	0x6562	"3c59x"	"3Com Corp.|3CCFEM656 Cyclone CardBus"
+0x10b7	0x6563	"3c59x"	"3Com Corp.|FEM656B 10/100 LAN+56K Modem CardBus PC Card"
+0x10b7	0x6564	"3c59x"	"3Com Corp.|3CCFEM656 Cyclone CardBus"
+0x10b7	0x6565	"unknown"	"3Com Corp.|3CCFEM656C Global 10/100 Fast Ethernet+56K Modem"
+0x10b7	0x7646	"3c59x"	"3Com Corp.|3cSOHO100-TX [Hurricane]"
+0x10b7	0x7770	"orinoco_plx"	"3Com Corp.|802.11b Wireless Ethernet Adapter"
+0x10b7	0x7940	"3c59x"	"3Com Corp.|3c803 FDDILink DAS Controller"
+0x10b7	0x7980	"3c59x"	"3Com Corp.|3c803 FDDILink UTP Controller"
+0x10b7	0x7990	"3c59x"	"3Com Corp.|3c804 FDDILink SAS Controller"
+0x10b7	0x8811	"unknown"	"3Com Corp.|Token ring"
+0x10b7	0x9000	"3c59x"	"3Com Corp.|3c900 10BaseT [Boomerang]"
+0x10b7	0x9001	"3c59x"	"3Com Corp.|3c900 Combo [Boomerang]"
+0x10b7	0x9004	"3c59x"	"3Com Corp.|3c900B-TPO [Etherlink XL TPO]"
+0x10b7	0x9005	"3c59x"	"3Com Corp.|3c900B-Combo [Etherlink XL Combo]"
+0x10b7	0x9006	"3c59x"	"3Com Corp.|3c900B-TPC [Etherlink XL TPC]"
+0x10b7	0x900a	"3c59x"	"3Com Corp.|3c900B-FL [Etherlink XL FL]"
+0x10b7	0x9050	"3c59x"	"3Com Corp.|3c905 100BaseTX [Boomerang]"
+0x10b7	0x9051	"3c59x"	"3Com Corp.|3c905 100BaseT4 [Boomerang]"
+0x10b7	0x9055	"3c59x"	"3Com Corp.|3c905B 100BaseTX [Cyclone]"
+0x10b7	0x9056	"3c59x"	"3Com Corp.|3c905B-T4 [Fast EtherLink XL 10/100]"
+0x10b7	0x9058	"3c59x"	"3Com Corp.|3c905B-Combo [Deluxe Etherlink XL 10/100]"
+0x10b7	0x905a	"3c59x"	"3Com Corp.|3c905B-FX [Fast Etherlink XL FX 10/100]"
+0x10b7	0x9200	"3c59x"	"3Com Corp.|3c905C-TX [Fast Etherlink]"
+0x10b7	0x9201	"3c90x"	"3Com Corp.|3c920 Tornado"
+0x10b7	0x9202	"3c59x"	"3Com Corp.|3Com 3C920B-EMB-WNM Integrated Fast Ethernet Controller"
+0x10b7	0x9210	"3c59x"	"3Com Corp.|3C920B-EMB-WNM Integrated Fast Ethernet Controller"
+0x10b7	0x9300	"tulip"	"3Com Corp.|3CSOHO100B-TX  [910-A01]"
+0x10b7	0x9800	"3c59x"	"3Com Corp.|3c980-TX [Fast Etherlink XL Server Adapter]"
+0x10b7	0x9805	"3c59x"	"3Com Corp.|3c980-TX [Fast Etherlink XL Server Adapter]"
+0x10b7	0x9900	"typhoon"	"3Com Corp.|3C990-TX Typhoon"
+0x10b7	0x9902	"typhoon"	"3Com Corp.|3CR990-TX-95 EtherLink 10/100 PCI with 3XP Processor"
+0x10b7	0x9903	"typhoon"	"3Com Corp.|3CR990-TX-97 EtherLink 10/100 PCI with 3XP Processor"
+0x10b7	0x9904	"typhoon"	"3Com Corp.|3CR990-TX-M EtherLink 10/100 PCI with 3XP Processor"
+0x10b7	0x9905	"typhoon"	"3Com Corp.|3CR990-FX-95/97/95 [Typhon Fiber]"
+0x10b7	0x9908	"typhoon"	"3Com Corp.|3CR990SVR95 EtherLink 10/100 Server PCI with 3XP"
+0x10b7	0x9909	"typhoon"	"3Com Corp.|3CR990SVR97 EtherLink 10/100 Server PCI with 3XP"
+0x10b7	0x990a	"typhoon"	"3Com Corp.|3C990BSVR EtherLink 10/100 Server PCI with 3XP"
+0x10b7	0x990b	"typhoon"	"3Com Corp.|3C990SVR [Typhoon Server]"
 0x10b8	0x0005	"epic100"	"Standard Microsystems Corp [SMC]|83C170QF"
 0x10b8	0x0006	"epic100"	"Standard Microsystems Corp [SMC]|LANEPIC"
 0x10b8	0x1000	"unknown"	"Standard Microsystems Corp [SMC]|FDC 37c665"
@@ -1934,8 +2064,11 @@
 0x10b8	0xa011	"unknown"	"Standard Microsystems Corp [SMC]|83C170QF"
 0x10b8	0xb106	"unknown"	"Standard Microsystems Corp [SMC]|SMC34C90"
 0x10b9	0x0000	"unknown"	"Acer Labs Inc.|MDV92XP NetoDragon PCI Soft Modem V92 NetoDragon"
+0x10b9	0x0101	"unknown"	"ALi Corp.|CMI8338/C3DX PCI Audio Device"
 0x10b9	0x0111	"snd-cmipci"	"Acer Laboratories Inc. [ALi]|C-Media CMI8738/C3DX Audio Device (OEM)"
 0x10b9	0x05ff	"alim1535d_wdt"	"Acer Laboratories Inc. [ALi]|"
+0x10b9	0x0780	"unknown"	"ALi Corp.|Multi-IO Card"
+0x10b9	0x0782	"unknown"	"ALi Corp.|Multi-IO Card"
 0x10b9	0x1435	"unknown"	"Acer Laboratories Inc. [ALi]|M1435"
 0x10b9	0x1445	"unknown"	"Acer Laboratories Inc. [ALi]|M1445"
 0x10b9	0x1449	"unknown"	"Acer Laboratories Inc. [ALi]|M1449"
@@ -1953,7 +2086,7 @@
 0x10b9	0x1541	"unknown"	"Acer Laboratories Inc. [ALi]|M1541"
 0x10b9	0x1543	"unknown"	"Acer Laboratories Inc. [ALi]|M1543"
 0x10b9	0x1561	"unknown"	"Acer Labs Inc.|M1561 North Bridge"
-0x10b9	0x1563	"unknown"	"ALi Corporation|M1563 HyperTransport South Bridge"
+0x10b9	0x1563	"unknown"	"ALi Corp.|M1563 HyperTransport South Bridge"
 0x10b9	0x1621	"unknown"	"Acer Laboratories Inc. [ALi]|M1621"
 0x10b9	0x1631	"unknown"	"Acer Laboratories Inc. [ALi]|ALI M1631 PCI North Bridge Aladdin Pro III"
 0x10b9	0x1632	"unknown"	"Acer Labs Inc.|M1632 North Bridge"
@@ -1966,8 +2099,8 @@
 0x10b9	0x1667	"unknown"	"Acer Labs Inc.|M1667 AGP System Controller"
 0x10b9	0x1671	"unknown"	"Acer Labs Inc.|M1671 Northbridge [Aladdin-P4]"
 0x10b9	0x1672	"unknown"	"Acer Labs Inc.| "
-0x10b9	0x1681	"unknown"	"ALi Corporation|M1681 P4 Northbridge [AGP8X,HyperTransport and SDR/DDR]"
-0x10b9	0x1687	"unknown"	"ALi Corporation|M1687 K8 Northbridge [AGP8X and HyperTransport]"
+0x10b9	0x1681	"unknown"	"ALi Corp.|M1681 P4 Northbridge [AGP8X,HyperTransport and SDR/DDR]"
+0x10b9	0x1687	"unknown"	"ALi Corp.|M1687 K8 Northbridge [AGP8X and HyperTransport]"
 0x10b9	0x3141	"unknown"	"Acer Laboratories Inc. [ALi]|M3141"
 0x10b9	0x3143	"unknown"	"Acer Laboratories Inc. [ALi]|M3143"
 0x10b9	0x3145	"unknown"	"Acer Laboratories Inc. [ALi]|M3145"
@@ -1976,7 +2109,7 @@
 0x10b9	0x3151	"unknown"	"Acer Laboratories Inc. [ALi]|M3151"
 0x10b9	0x3307	"unknown"	"Acer Laboratories Inc. [ALi]|M3307"
 0x10b9	0x3309	"unknown"	"Acer Laboratories Inc. [ALi]|M3309"
-0x10b9	0x3323	"unknown"	"ALi Corporation|M3325 Video/Audio Decoder"
+0x10b9	0x3323	"unknown"	"ALi Corp.|M3325 Video/Audio Decoder"
 0x10b9	0x5212	"unknown"	"Acer Laboratories Inc. [ALi]|M4803"
 0x10b9	0x5215	"unknown"	"Acer Laboratories Inc. [ALi]|MS4803"
 0x10b9	0x5217	"unknown"	"Acer Laboratories Inc. [ALi]|M5217H"
@@ -1992,24 +2125,25 @@
 0x10b9	0x5243	"unknown"	"Acer Laboratories Inc. [ALi]|M5243"
 0x10b9	0x5244	"unknown"	"Acer Labs Incorporated (ALI)|Floppy Disk Controller"
 0x10b9	0x5247	"unknown"	"Acer Laboratories Inc. [ALi]|M5247"
-0x10b9	0x5249	"unknown"	"ALi Corporation|M5249 HTT to PCI Bridge"
+0x10b9	0x5249	"unknown"	"ALi Corp.|M5249 HTT to PCI Bridge"
 0x10b9	0x5251	"unknown"	"Acer Laboratories Inc. [ALi]|M5251 P1394 OHCI 1.0 Controller"
 0x10b9	0x5253	"unknown"	"Acer Laboratories Inc. [ALi]|M5253 P1394 OHCI 1.1 Controller"
 0x10b9	0x5255	"unknown"	"Acer Laboratories Inc. [ALi]|M5455 PCI AC-Link Controller Audio Device"
 0x10b9	0x5261	"dmfe"	"Acer Laboratories Inc. [ALi]|M5261 Ethernet Controller"
 0x10b9	0x5271	"unknown"	"Acer Laboratories Inc. [ALi]|M5471 Memory Stick Controller"
 0x10b9	0x5273	"unknown"	"Acer Laboratories Inc. [ALi]|M5473 SD-MMC Controller"
+0x10b9	0x5281	"unknown"	"ALi Corporation|ALi M5281 Serial ATA / RAID Host Controller"
 0x10b9	0x5427	"unknown"	"Acer Labs (see also vendor 1025h)|ALI PCI to AGP Bridge"
 0x10b9	0x5450	"unknown"	"Acer Labs Inc.|Agere Systems AC97 Modem"
 0x10b9	0x5451	"snd-ali5451"	"Acer Laboratories Inc. [ALi]|M5451 PCI South Bridge Audio"
 0x10b9	0x5453	"trident"	"Acer Laboratories Inc. [ALi]|M5453 PCI AC-Link Controller Modem Device"
 0x10b9	0x5455	"snd-intel8x0"	"Acer Laboratories Inc. [ALi]|M5455 PCI AC-Link Controller Audio Device"
-0x10b9	0x5457	"unknown"	"Acer Laboratories Inc. [ALi]|M5457 AC-Link Modem Interface Controller"
-0x10b9	0x5459	"unknown"	"ALi Corporation|SmartPCI561 56K Modem"
-0x10b9	0x545a	"unknown"	"ALi Corporation|SmartLink SmartPCI563 56K Modem"
+0x10b9	0x5457	"slamr"	"Acer Laboratories Inc. [ALi]|M5457 AC-Link Modem Interface Controller"
+0x10b9	0x5459	"slamr"	"ALi Corp.|SmartPCI561 56K Modem"
+0x10b9	0x545a	"slamr"	"ALi Corp.|SmartLink SmartPCI563 56K Modem"
 0x10b9	0x5471	"unknown"	"Acer Laboratories Inc. [ALi]|M5471 Memory Stick Controller"
 0x10b9	0x5473	"unknown"	"Acer Laboratories Inc. [ALi]|M5473 SD-MMC Controller"
-0x10b9	0x7101	"unknown"	"Acer Laboratories Inc. [ALi]|M7101 PMU"
+0x10b9	0x7101	"i2c-ali1535"	"Acer Laboratories Inc. [ALi]|M7101 PMU"
 0x10ba	0x0301	"unknown"	"Mitsubishi Electric Corp.|AccelGraphics AccelECLIPSE"
 0x10ba	0x0304	"unknown"	"Mitsubishi Electronics Corp.|GUI Accelerator"
 0x10ba	0x0308	"unknown"	"Mitsubishi Electric Corp.|Tornado 3000 [OEM Evans & Sutherland]"
@@ -2025,19 +2159,30 @@
 0x10c3	0x8925	"unknown"	"Samsung Semiconductors| "
 0x10c4	0x8363	"unknown"	"Award Software Int'l Inc.| "
 0x10c8	0x0000	"unknown"	"Neomagic Corp|Graphics Controller"
-0x10c8	0x0001	"Card:NeoMagic (laptop/notebook)"	"Neomagic Corporation|NM2070 [MagicGraph NM2070]"
-0x10c8	0x0002	"Card:NeoMagic (laptop/notebook)"	"Neomagic Corporation|NM2090 [MagicGraph 128V]"
-0x10c8	0x0003	"Card:NeoMagic (laptop/notebook)"	"Neomagic Corporation|NM2093 [MagicGraph 128ZV]"
-0x10c8	0x0004	"Card:NeoMagic 128XD"	"Neomagic Corporation|NM2160 [MagicGraph 128XD]"
-0x10c8	0x0005	"Card:NeoMagic (laptop/notebook)"	"Neomagic Corporation|[MagicGraph 256AV]"
-0x10c8	0x0006	"Card:NeoMagic MagicMedia (laptop/notebook)"	"Neomagic Corporation|NM2360 [MagicMedia 256ZX]"
-0x10c8	0x0016	"Card:NeoMagic MagicMedia 256XL+"	"Neomagic Corporation|[MagicMedia 256XL+]"
-0x10c8	0x0025	"Card:NeoMagic MagicMedia (laptop/notebook)"	"Neomagic Corporation|[MagicMedia 256AV+]"
-0x10c8	0x0083	"Card:NeoMagic (laptop/notebook)"	"Neomagic Corporation|[MagicGraph 128ZV Plus]"
-0x10c8	0x8005	0x1028	0x008f	"ad1848"	"Dell Computer Corporation|MagicMedia 256AV Audio Device on Colorado Inspiron"
-0x10c8	0x8005	"nm256_audio"	"Neomagic Corporation|[MagicMedia 256AV]"
-0x10c8	0x8006	"nm256_audio"	"Neomagic Corporation|[MagicMedia 256AV]"
-0x10c8	0x8016	"unknown"	"Neomagic Corporation|NM2380 MagicMedia 256XL+ Audio Device"
+0x10c8	0x0001	"Card:NeoMagic (laptop/notebook)"	"Neomagic Corp.|NM2070 [MagicGraph NM2070]"
+0x10c8	0x0002	"Card:NeoMagic (laptop/notebook)"	"Neomagic Corp.|NM2090 [MagicGraph 128V]"
+0x10c8	0x0003	"Card:NeoMagic (laptop/notebook)"	"Neomagic Corp.|NM2093 [MagicGraph 128ZV]"
+0x10c8	0x0004	"Card:NeoMagic 128XD"	"Neomagic Corp.|NM2160 [MagicGraph 128XD]"
+0x10c8	0x0005	"Card:NeoMagic (laptop/notebook)"	"Neomagic Corp.|[MagicGraph 256AV]"
+0x10c8	0x0006	"Card:NeoMagic MagicMedia (laptop/notebook)"	"Neomagic Corp.|NM2360 [MagicMedia 256ZX]"
+0x10c8	0x0016	"Card:NeoMagic MagicMedia 256XL+"	"Neomagic Corp.|[MagicMedia 256XL+]"
+0x10c8	0x0025	"Card:NeoMagic MagicMedia (laptop/notebook)"	"Neomagic Corp.|[MagicMedia 256AV+]"
+0x10c8	0x0083	"Card:NeoMagic (laptop/notebook)"	"Neomagic Corp.|[MagicGraph 128ZV Plus]"
+0x10c8	0x8005	0x0e11	0xb0d1	"nm256_audio"	"Neomagic Corp.|MagicMedia 256AV Audio Device on Discovery"
+0x10c8	0x8005	0x0e11	0xb126	"nm256_audio"	"Neomagic Corp.|MagicMedia 256AV Audio Device on Durango"
+0x10c8	0x8005	0x1014	0x00dd	"nm256_audio"	"Neomagic Corp.|MagicMedia 256AV Audio Device on BlackTip Thinkpad"
+0x10c8	0x8005	0x1025	0x1003	"nm256_audio"	"Neomagic Corp.|MagicMedia 256AV Audio Device on TravelMate 720"
+0x10c8	0x8005	0x1028	0x0088	"nm256_audio"	"Neomagic Corporation|Latitude CPi A"
+0x10c8	0x8005	0x1028	0x008f	"ad1848"	"Dell Computer Corp.|MagicMedia 256AV Audio Device on Colorado Inspiron"
+0x10c8	0x8005	0x103c	0x0007	"nm256_audio"	"Neomagic Corp.|MagicMedia 256AV Audio Device on Voyager II"
+0x10c8	0x8005	0x103c	0x0008	"nm256_audio"	"Neomagic Corp.|MagicMedia 256AV Audio Device on Voyager III"
+0x10c8	0x8005	0x103c	0x000d	"nm256_audio"	"Neomagic Corp.|MagicMedia 256AV Audio Device on Omnibook 900"
+0x10c8	0x8005	0x10c8	0x8005	"nm256_audio"	"Neomagic Corp.|MagicMedia 256AV Audio Device on FireAnt"
+0x10c8	0x8005	0x110a	0x8005	"nm256_audio"	"Neomagic Corp.|MagicMedia 256AV Audio Device"
+0x10c8	0x8005	0x14c0	0x0004	"nm256_audio"	"Neomagic Corp.|MagicMedia 256AV Audio Device"
+0x10c8	0x8005	"nm256_audio"	"Neomagic Corp.|[MagicMedia 256AV]"
+0x10c8	0x8006	"nm256_audio"	"Neomagic Corp.|[MagicMedia 256AV]"
+0x10c8	0x8016	"nm256_audio"	"Neomagic Corp.|NM2380 MagicMedia 256XL+ Audio Device"
 0x10cc	0x0226	"unknown"	"Mentor Arc Inc|PCI/ISA Bridge"
 0x10cc	0x0257	"unknown"	"Mentor Arc Inc|Host/PCI Bridge"
 0x10cc	0x0660	"unknown"	"Mai Logic Incorporated|Articia S Host Bridge"
@@ -2080,185 +2225,334 @@
 0x10dc	0x0101	"unknown"	"CERN-European Lab. for Particle Physics|SL651 7057 C200 Acquisition card for the SPS Orbit System (MACI)"
 0x10dc	0x10dc	"unknown"	"CERN/ECP/EDU|ATT2C15-3 FPGA"
 0x10dd	0x0001	"unknown"	"Evans & Sutherland|3D Graphics Processor (?? Freedom GBbus??)"
-0x10de	0x0008	"Card:Diamond Edge 3D"	"nVidia Corporation|NV1 EDGE 3D"
-0x10de	0x0009	"Card:Diamond Edge 3D"	"nVidia Corporation|NV1 EDGE 3D"
-0x10de	0x0010	"unknown"	"nVidia Corporation|Mutara V08 [NV2]"
-0x10de	0x0018	"unknown"	"Nvidia Corporation|Riva 128 Riva 128 accelerator"
-0x10de	0x0019	"unknown"	"Nvidia Corporation|Riva 128 ZX"
-0x10de	0x0020	"Card:RIVA TNT"	"nVidia Corporation|Riva TNT 128"
-0x10de	0x0028	"Card:RIVA TNT2"	"nVidia Corporation|Riva TNT2"
-0x10de	0x0029	"Card:RIVA TNT2"	"nVidia Corporation|Riva TNT2 Ultra"
-0x10de	0x002a	"Card:RIVA TNT2"	"nVidia Corporation|Riva TnT2 [NV5]"
-0x10de	0x002b	"Card:RIVA TNT2"	"nVidia Corporation|Riva TnT2 [NV5]"
-0x10de	0x002c	"Card:RIVA TNT2"	"nVidia Corporation|Vanta"
-0x10de	0x002d	"Card:RIVA TNT2"	"nVidia Corporation|Riva TNT2 Model 64"
-0x10de	0x002e	"Card:RIVA TNT2"	"nVidia Corporation|Vanta [NV6]"
-0x10de	0x002f	"Card:RIVA TNT2"	"nVidia Corporation|Vanta [NV6]"
-0x10de	0x0060	"unknown"	"Nvidia Corporation|nForce2 LPC / Legacy / System Management"
-0x10de	0x0064	"unknown"	"Nvidia Corporation|nForce2 SMBus 2.0 Controller"
-0x10de	0x0065	"unknown"	"Nvidia Corporation|nForce2 UDMA 100 IDE Controller"
-0x10de	0x0066	"forcedeth"	"Nvidia Corporation|nForce2 MCP Networking Adapter"
-0x10de	0x0067	"usb-ohci"	"Nvidia Corporation|nForce2 USB 1.0 OHCI Controller"
-0x10de	0x0068	"ehci-hcd"	"Nvidia Corporation|nForce2 USB 2.0 Enhanced Controller"
-0x10de	0x006a	"snd-intel8x0"	"Nvidia Corporation|nForce2 Audio Codec Interface"
-0x10de	0x006b	"unknown"	"Nvidia Corporation|nForce2 APU"
-0x10de	0x006c	"unknown"	"Nvidia Corporation|nForce2 External PCI Bridge"
-0x10de	0x006d	"unknown"	"Nvidia Corporation|nForce2 PCI Bridge"
-0x10de	0x006e	"ohci1394"	"Nvidia Corporation|nForce2 Firewire Controller"
-0x10de	0x00a0	"Card:RIVA TNT2"	"nVidia Corporation|Riva TNT2"
-0x10de	0x00d0	"unknown"	"Nvidia Corporation|nForce3 LPC Bridge"
-0x10de	0x00d1	"amd64-agp"	"Nvidia Corporation|nForce 3 Host Bridge"
-0x10de	0x00d2	"unknown"	"Nvidia Corporation|nForce3 AGP Bridge"
-0x10de	0x00d4	"unknown"	"Nvidia Corporation|nForce MCP3? SMBus Controller"
-0x10de	0x00d5	"unknown"	"Nvidia Corporation|nForce3 IDE"
-0x10de	0x00d6	"forcedeth"	"Nvidia Corporation|nForce3 MCP Networking Adapter"
-0x10de	0x00d7	"unknown"	"Nvidia Corporation|nForce3 USB 1.1"
-0x10de	0x00d8	"unknown"	"Nvidia Corporation|nForce3 USB 2.0"
-0x10de	0x00da	"snd-intel8x0"	"Nvidia Corporation|nForce2 Audio Codec Interface"
-0x10de	0x00dd	"unknown"	"Nvidia Corporation|nForce3 PCI Bridge"
-0x10de	0x00e1	"amd64-agp"	"Nvidia Corporation|"
-0x10de	0x00ea	"snd-intel8x0"	"Nvidia Corporation|"
-0x10de	0x0100	"Card:NVIDIA GeForce 256 (generic)"	"nVidia Corporation|GeForce 256"
-0x10de	0x0101	"Card:NVIDIA GeForce 256 (generic)"	"nVidia Corporation|GeForce DDR"
-0x10de	0x0102	"Card:NVIDIA GeForce 256 (generic)"	"nVidia Corporation|NV10 GeForce 256 Ultra"
-0x10de	0x0103	"Card:NVIDIA GeForce 256 (generic)"	"nVidia Corporation|Quadro"
-0x10de	0x0110	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corporation|NV11 Geforce2 MX/MX 400"
-0x10de	0x0111	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corporation|NV11 geForce2 100/200"
-0x10de	0x0112	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corporation|NV11 Geforce2 Go"
-0x10de	0x0113	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corporation|NV11 Quadro2 MXR/EX/Go"
-0x10de	0x0150	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corporation|NV15 Geforce2 GTS"
-0x10de	0x0151	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corporation|NV15 Geforce2 Ti"
-0x10de	0x0152	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corporation|NV15 Bladerunner (GeForce2 Ultra)"
-0x10de	0x0153	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corporation|NV15 Quadro2 Pro"
-0x10de	0x0170	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17 GeForce4 MX 460"
-0x10de	0x0171	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17 GeForce4 MX 440"
-0x10de	0x0172	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17 GeForce4 MX 420"
-0x10de	0x0173	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17 GeForce4 MMX 440-SE"
-0x10de	0x0174	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17M GeForce4 440 Go"
-0x10de	0x0175	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17M GeForce4 420 Go"
-0x10de	0x0176	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17M GeForce4 420 Go 32M"
-0x10de	0x0177	"Card:NVIDIA GeForce4 (generic)"	"NVIDIA Corporation|NV17M GeForce4 460 Go"
-0x10de	0x0178	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17GL Quadro4 500XGL"
-0x10de	0x0179	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17M GeForce4 440 Go 64M"
-0x10de	0x017a	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17GL Quadro4 200/400NVS"
-0x10de	0x017b	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17GL Quadro4 550XGL"
-0x10de	0x017c	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17M-GL Quadro4 500 GoGL"
-0x10de	0x017d	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV17M GeForce4 410 Go 16M"
-0x10de	0x0181	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV18 GeForce4 MX440 AGP 8x"
-0x10de	0x0182	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV18 GeForce4 MX440SE AGP 8x"
-0x10de	0x0183	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV18 GeForce4 MX420 AGP 8x"
-0x10de	0x0185	"Card:NVIDIA GeForce4 (generic)"	"NVIDIA Corporation|NV18.6? GeForce4 MX 4000"
-0x10de	0x0186	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV18 GeForce4 448 Go"
-0x10de	0x0187	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV18 GeForce4 488 Go"
-0x10de	0x0188	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV18 Quadro4 580 XGL"
-0x10de	0x018a	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV18 Quadro4 280 NVS"
-0x10de	0x018b	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corporation|NV18 Quadro4 380 XGL"
-0x10de	0x01a0	"Card:NVIDIA GeForce2 Integrated (generic)"	"NVidia|GeForce2 Integrated GPU"
-0x10de	0x01a4	"unknown"	"Nvidia Corporation|nForce AGP Controller"
-0x10de	0x01a5	"unknown"	"Nvidia Corporation|nForce AGP Controller"
-0x10de	0x01a6	"unknown"	"Nvidia Corporation|nForce AGP Controller"
-0x10de	0x01a8	"unknown"	"Nvidia Corporation|nForce 220 Memory Controller (SDR)"
-0x10de	0x01a9	"unknown"	"Nvidia Corporation|nForce 420 Memory Controller (SDR)"
-0x10de	0x01aa	"unknown"	"Nvidia Corporation|nForce 220 Memory Controller (DDR)"
-0x10de	0x01ab	"unknown"	"Nvidia Corporation|nForce 420 Memory Controller (DDR)"
-0x10de	0x01ac	"unknown"	"Nvidia Corporation|nForce 220/420 Memory Controller"
-0x10de	0x01ad	"forcedeth"	"Nvidia Corporation|nForce Ethernet Controller"
-0x10de	0x01b0	"unknown"	"Nvidia Corporation|nForce MCP Audio Processing Unit (Dolby Digital)"
-0x10de	0x01b1	"i810_audio"	"Nvidia Corporation|nForce Audio Codec Interface"
-0x10de	0x01b2	"unknown"	"Nvidia Corporation|nForce Joystick"
-0x10de	0x01b4	"unknown"	"Nvidia Corporation|nForce SMBus Controller"
-0x10de	0x01b7	"unknown"	"Nvidia Corporation|nForce AGP Host to PCI Bridge"
-0x10de	0x01b8	"unknown"	"Nvidia Corporation|nForce PCI Bridge"
-0x10de	0x01bc	"unknown"	"Nvidia Corporation|nForce ATA Controller"
-0x10de	0x01c1	"unknown"	"nVidia Corporation|Intel 537 [nForce MC97 Modem]"
-0x10de	0x01c2	"usb-ohci"	"Nvidia Corporation|nForce USB Controller"
-0x10de	0x01c3	"forcedeth"	"Nvidia Corporation|nForce MCP Networking Adapter"
-0x10de	0x01e0	"unknown"	"Nvidia Corporation|nForce2 AGP Controller"
-0x10de	0x01e1	"unknown"	"NVIDIA Corporation|nForce2 AGP Controller"
-0x10de	0x01e8	"unknown"	"Nvidia Corporation|nForce2 AGP Host to PCI Bridge"
-0x10de	0x01ea	"unknown"	"NVIDIA Corporation|nForce2 Memory Controller 0"
-0x10de	0x01eb	"unknown"	"Nvidia Corporation|nForce2 Memory Controller"
-0x10de	0x01ec	"unknown"	"Nvidia Corporation|nForce2 Memory Controller"
-0x10de	0x01ed	"unknown"	"Nvidia Corporation|nForce2 Memory Controller"
-0x10de	0x01ee	"unknown"	"Nvidia Corporation|nForce2 Memory Controller"
-0x10de	0x01ef	"unknown"	"Nvidia Corporation|nForce2 Memory Controller"
-0x10de	0x01f0	"Card:NVIDIA GeForce4 (generic)"	"Nvidia Corporation|nForce2 Geforce 4 Integrated"
-0x10de	0x0200	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corporation|GeForce3"
-0x10de	0x0201	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corporation|GeForce3 Ti 200"
-0x10de	0x0202	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corporation|GeForce3 Ti 500"
-0x10de	0x0203	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corporation|Quadro DDC"
-0x10de	0x0250	"Card:NVIDIA GeForce4 (generic)"	"NVidia|NV25 GeForce4 Ti4600"
-0x10de	0x0251	"Card:NVIDIA GeForce4 (generic)"	"NVidia|NV25 GeForce4 Ti4400"
-0x10de	0x0252	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x252"
-0x10de	0x0253	"Card:NVIDIA GeForce4 (generic)"	"NVidia|NV25 GeForce4 Ti4200"
-0x10de	0x0258	"Card:NVIDIA GeForce4 (generic)"	"NVidia|Quadro4 900 XGL"
-0x10de	0x0259	"Card:NVIDIA GeForce4 (generic)"	"NVidia|Quadro4 750 XGL"
-0x10de	0x025b	"Card:NVIDIA GeForce4 (generic)"	"NVidia|Quadro4 750 XGL"
-0x10de	0x0280	"Card:NVIDIA GeForce4 (generic)"	"NVidia|GeForce4 Ti 4800"
-0x10de	0x0281	"Card:NVIDIA GeForce4 (generic)"	"NVidia|GeForce4 Ti 4200 with AGP8X"
-0x10de	0x0282	"Card:NVIDIA GeForce4 (generic)"	"NVidia|GeForce4 Ti 4800 SE"
-0x10de	0x0286	"Card:NVIDIA GeForce4 (generic)"	"NVidia|GeForce4 Ti 4200 Go"
-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	0x02a0	"Card:NVIDIA GeForce3 (generic)"	"NVidia|GeForce3 Integrated (Xbox)"
-0x10de	0x0300	"Card:NVIDIA GeForce FX (generic)"	"NVidia|NV30 GeForce FX"
-0x10de	0x0301	"Card:NVIDIA GeForce FX (generic)"	"NVidia|GeForce FX 5800 Ultra"
-0x10de	0x0302	"Card:NVIDIA GeForce FX (generic)"	"NVidia|GeForce FX 5800"
-0x10de	0x0308	"Card:NVIDIA GeForce FX (generic)"	"NVidia|Quadro FX 2000"
-0x10de	0x0309	"Card:NVIDIA GeForce FX (generic)"	"NVidia|Quadro FX 1000"
-0x10de	0x0311	"Card:NVIDIA GeForce FX (generic)"	"NVidia|GeForce FX 5600"
-0x10de	0x0312	"Card:NVIDIA GeForce FX (generic)"	"NVidia|GeForce FX 5600"
-0x10de	0x0314	"Card:NVIDIA GeForce FX (generic)"	"NVIDIA Corporation|NV31 GeForce FX 5600XT"
-0x10de	0x0316	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x316"
-0x10de	0x0317	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x317"
-0x10de	0x0318	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x318"
-0x10de	0x0319	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x319"
-0x10de	0x031a	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x31A"
-0x10de	0x031b	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x31B"
-0x10de	0x031c	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x31C"
-0x10de	0x031d	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x31D"
-0x10de	0x031e	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x31E"
-0x10de	0x031f	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x31F"
-0x10de	0x0321	"Card:NVIDIA GeForce FX (generic)"	"NVidia|GeForce FX 5200 Ultra"
-0x10de	0x0322	"Card:NVIDIA GeForce FX (generic)"	"NVidia|GeForce FX 5200"
-0x10de	0x0323	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x323"
-0x10de	0x0324	"Card:NVIDIA GeForce FX (generic)"	"NVidia|NV30GL [GeForce FX 5200 Go]"
-0x10de	0x0325	"unknown"	"NVIDIA Corporation|??? GeForce FX Go 5250"
-0x10de	0x0326	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x326"
-0x10de	0x0328	"Card:NVIDIA GeForce FX (generic)"	"NVidia|GeForce FX Go 5200"
-0x10de	0x0329	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV34M [GeForce FX Go5200]"
-0x10de	0x032a	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x32A"
-0x10de	0x032b	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x32B"
-0x10de	0x032c	"Card:NVIDIA GeForce FX (generic)"	"NVIDIA Corporation|??? NVIDIA GeForce FX Go 5300"
-0x10de	0x032e	"Card:NVIDIA GeForce4 (generic)"	"NVidia|0x32E"
-0x10de	0x032f	"unknown"	"NVIDIA Corporation|NV34GL ???"
-0x10de	0x0330	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV35 [GeForce FX 5900 Ultra]"
-0x10de	0x0331	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV35 [GeForce FX 5900]"
-0x10de	0x0332	"Card:NVIDIA GeForce FX (generic)"	"NVIDIA Corporation|??? GeForce FX 5900XT"
-0x10de	0x0333	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV38 [GeForce FX 5950]"
-0x10de	0x0338	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV35GL [Quadro FX 3000]"
-0x10de	0x0341	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV36 [GeForce FX 5700 Ultra]"
-0x10de	0x0342	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV36 [GeForce FX 5700]"
-0x10de	0x034e	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV36 [Quadro FX 1100]"
-0x10df	0x10df	"unknown"	"Emulex Corporation|Light Pulse Fibre Channel Adapter"
-0x10df	0x1ae5	"unknown"	"Emulex Corporation|LP6000 Fibre Channel Host Adapter"
-0x10df	0x1ae6	"unknown"	"Emulex Corporation|LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)"
-0x10df	0x1ae7	"unknown"	"Emulex Corporation|LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:2-3)"
-0x10df	0xf085	"unknown"	"Emulex Corporation|LP850 Fibre Channel Adapter"
-0x10df	0xf095	"unknown"	"Emulex Corporation|LP952 Fibre Channel Adapter"
-0x10df	0xf098	"unknown"	"Emulex Corporation|LP982 Fibre Channel Adapter"
-0x10df	0xf0a5	"lpfcdd"	"Emulex Corporation|LP1050 Fibre Channel Host Adapter"
-0x10df	0xf700	"lpfcdd"	"Emulex Corporation|LP7000 Fibre Channel Host Adapter"
-0x10df	0xf701	"unknown"	"Emulex Corporation|LP 7000EFibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)"
-0x10df	0xf800	"lpfcdd"	"Emulex Corporation|LP8000 Fibre Channel Host Adapter"
-0x10df	0xf801	"unknown"	"Emulex Corporation|LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)"
-0x10df	0xf900	"lpfcdd"	"Emulex Corporation|LP9000 Fibre Channel Host Adapter"
-0x10df	0xf901	"unknown"	"Emulex Corporation|LP 9000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)"
-0x10df	0xf980	"lpfcdd"	"Emulex Corporation|LP9802 Fibre Channel Host Adapter"
-0x10df	0xf981	"unknown"	"Emulex Corporation|LP 9802 Fibre Channel Host Adapter Alternate ID"
-0x10df	0xf982	"unknown"	"Emulex Corporation|LP 9802 Fibre Channel Host Adapter Alternate ID"
-0x10df	0xfa00	"lpfcdd"	"Emulex Corporation|LP10000 Fibre Channel Adapter"
+0x10de	0x0008	"Card:Diamond Edge 3D"	"nVidia Corp.|NV1 EDGE 3D"
+0x10de	0x0009	"Card:Diamond Edge 3D"	"nVidia Corp.|NV1 EDGE 3D"
+0x10de	0x0010	"unknown"	"nVidia Corp.|Mutara V08 [NV2]"
+0x10de	0x0018	"unknown"	"nVidia Corp.|Riva 128 Riva 128 accelerator"
+0x10de	0x0019	"unknown"	"nVidia Corp.|Riva 128 ZX"
+0x10de	0x0020	"Card:RIVA TNT"	"nVidia Corp.|Riva TNT 128"
+0x10de	0x0028	"Card:RIVA TNT2"	"nVidia Corp.|Riva TNT2"
+0x10de	0x0029	"Card:RIVA TNT2"	"nVidia Corp.|Riva TNT2 Ultra"
+0x10de	0x002a	"Card:RIVA TNT2"	"nVidia Corp.|Riva TnT2 [NV5]"
+0x10de	0x002b	"Card:RIVA TNT2"	"nVidia Corp.|Riva TnT2 [NV5]"
+0x10de	0x002c	"Card:RIVA TNT2"	"nVidia Corp.|Vanta"
+0x10de	0x002d	"Card:RIVA TNT2"	"nVidia Corp.|Riva TNT2 Model 64"
+0x10de	0x002e	"Card:RIVA TNT2"	"nVidia Corp.|Vanta [NV6]"
+0x10de	0x002f	"Card:RIVA TNT2"	"nVidia Corp.|Vanta [NV6]"
+0x10de	0x0034	"unknown"	"nVidia Corporation|MCP04 SMBus"
+0x10de	0x0035	"unknown"	"nVidia Corporation|MCP04 IDE"
+0x10de	0x0036	"sata_nv"	"nVidia Corp.|"
+0x10de	0x0037	"forcedeth"	"nVidia Corp.|Ethernet controller"
+0x10de	0x0038	"forcedeth"	"nVidia Corp.|Ethernet controller"
+0x10de	0x003a	"snd-intel8x0"	"nVidia Corporation|MCP04 AC'97 Audio Controller"
+0x10de	0x003b	"unknown"	"nVidia Corporation|MCP04 USB Controller"
+0x10de	0x003c	"unknown"	"nVidia Corporation|MCP04 USB Controller"
+0x10de	0x003d	"unknown"	"nVidia Corporation|MCP04 PCI Bridge"
+0x10de	0x003e	"sata_nv"	"nVidia Corp.|"
+0x10de	0x0040	"unknown"	"nVidia Corporation|nv40 [GeForce 6800 Ultra]"
+0x10de	0x0041	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|NV40 OS1RT00B30"
+0x10de	0x0042	"unknown"	"nVidia Corporation|NV40.2"
+0x10de	0x0043	"unknown"	"nVidia Corporation|NV40.3"
+0x10de	0x0045	"Card:NVIDIA GeForce 6800 (generic)"	"nVidia Corp.|NV40 [GeForce 6800GT]"
+0x10de	0x0049	"unknown"	"nVidia Corporation|NV40GL"
+0x10de	0x004e	"unknown"	"nVidia Corporation|NV40GL [Quadro FX 4000]"
+0x10de	0x0050	"unknown"	"nVidia Corp.|CK804 ISA Bridge"
+0x10de	0x0051	"unknown"	"nVidia Corp.|CK804 ISA Bridge"
+0x10de	0x0052	"i2c-nforce2"	"nVidia Corp.|CK804 SMBus"
+0x10de	0x0053	"amd74xx"	"nVidia Corp.|CK804 IDE"
+0x10de	0x0054	"sata_nv"	"nVidia Corp.|CK804 Serial ATA Controller"
+0x10de	0x0055	"sata_nv"	"nVidia Corp.|CK804 Serial ATA Controller"
+0x10de	0x0056	"forcedeth_ng"	"nVidia Corp.|Ethernet controller"
+0x10de	0x0057	"forcedeth_ng"	"nVidia Corp.|Ethernet controller"
+0x10de	0x0058	"unknown"	"nVidia Corp.|CK804 AC'97 Modem"
+0x10de	0x0059	"snd-intel8x0"	"nVidia Corp.|CK804 AC'97 Audio Controller"
+0x10de	0x005a	"unknown"	"nVidia Corp.|CK804 USB Controller"
+0x10de	0x005b	"unknown"	"nVidia Corp.|CK804 USB Controller"
+0x10de	0x005c	"unknown"	"nVidia Corp.|CK804 PCI Bridge"
+0x10de	0x005d	"unknown"	"nVidia Corp.|CK804 PCIE Bridge"
+0x10de	0x005e	"unknown"	"nVidia Corp.|CK804 Memory Controller"
+0x10de	0x005f	"unknown"	"nVidia Corp.|CK804 Memory Controller"
+0x10de	0x0060	"unknown"	"nVidia Corp.|nForce2 LPC / Legacy / System Management"
+0x10de	0x0064	"i2c-nforce2"	"nVidia Corp.|nForce2 SMBus 2.0 Controller"
+0x10de	0x0065	"unknown"	"nVidia Corp.|nForce2 UDMA 100/133 IDE Controller"
+0x10de	0x0066	"forcedeth"	"nVidia Corp.|nForce2 MCP Networking Adapter"
+0x10de	0x0067	"usb-ohci"	"nVidia Corp.|nForce2 USB 1.0 OHCI Controller"
+0x10de	0x0068	"ehci-hcd"	"nVidia Corp.|nForce2 USB 2.0 Enhanced Controller"
+0x10de	0x0069	"snd-intel8x0m"	""
+0x10de	0x006a	"snd-intel8x0"	"nVidia Corp.|nForce2 Audio Codec Interface"
+0x10de	0x006b	"unknown"	"nVidia Corp.|nForce2 APU"
+0x10de	0x006c	"unknown"	"nVidia Corp.|nForce2 External PCI Bridge"
+0x10de	0x006d	"unknown"	"nVidia Corp.|nForce2 PCI Bridge"
+0x10de	0x006e	"ohci1394"	"nVidia Corp.|nForce2 Firewire Controller"
+0x10de	0x0084	"unknown"	"nVidia Corporation|MCP2A SMBus"
+0x10de	0x0085	"unknown"	"nVidia Corporation|MCP2A IDE"
+0x10de	0x0086	"forcedeth"	"nVidia Corp.|Ethernet controller"
+0x10de	0x0087	"unknown"	"nVidia Corporation|MCP2A USB Controller"
+0x10de	0x0088	"unknown"	"nVidia Corporation|MCP2A USB Controller"
+0x10de	0x0089	"snd-intel8x0m"	""
+0x10de	0x008a	"snd-intel8x0"	"nVidia Corporation|MCP2S AC'97 Audio Controller"
+0x10de	0x008b	"unknown"	"nVidia Corporation|MCP2A PCI Bridge"
+0x10de	0x008c	"forcedeth"	"nVidia Corp.|Ethernet controller"
+0x10de	0x008e	"sata_nv"	"nVidia Corp.|Ethernet controller"
+0x10de	0x00a0	"Card:RIVA TNT2"	"nVidia Corp.|Riva TNT2"
+0x10de	0x00c0	"unknown"	"nVidia Corporation|NV41.0"
+0x10de	0x00c1	"unknown"	"nVidia Corporation|NV41.1"
+0x10de	0x00c2	"unknown"	"nVidia Corporation|NV41.2"
+0x10de	0x00c8	"unknown"	"nVidia Corporation|NV41.8"
+0x10de	0x00ce	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|Quadro FX 1400"
+0x10de	0x00d0	"unknown"	"nVidia Corp.|nForce3 LPC Bridge"
+0x10de	0x00d1	"amd64-agp"	"nVidia Corp.|nForce 3 Host Bridge"
+0x10de	0x00d2	"unknown"	"nVidia Corp.|nForce3 AGP Bridge"
+0x10de	0x00d3	"unknown"	"nVidia Corporation|CK804 Memory Controller"
+0x10de	0x00d4	"unknown"	"nVidia Corp.|nForce MCP3? SMBus Controller"
+0x10de	0x00d5	"unknown"	"nVidia Corp.|nForce3 IDE"
+0x10de	0x00d6	"forcedeth"	"nVidia Corp.|nForce3 MCP Networking Adapter"
+0x10de	0x00d7	"unknown"	"nVidia Corp.|nForce3 USB 1.1"
+0x10de	0x00d8	"unknown"	"nVidia Corp.|nForce3 USB 2.0"
+0x10de	0x00d9	"snd-intel8x0m"	""
+0x10de	0x00da	"snd-intel8x0"	"nVidia Corp.|nForce2 Audio Codec Interface"
+0x10de	0x00dd	"unknown"	"nVidia Corp.|nForce3 PCI Bridge"
+0x10de	0x00df	"forcedeth"	"nVidia Corp.|Ethernet adapter"
+0x10de	0x00e1	"amd64-agp"	"nVidia Corp.|"
+0x10de	0x00e2	"unknown"	"nVidia Corporation|nForce3 250Gb AGP Host to PCI Bridge"
+0x10de	0x00e3	"sata_nv"	"nVidia Corp.|"
+0x10de	0x00e4	"unknown"	"nVidia Corporation|nForce 250Gb PCI System Management"
+0x10de	0x00e5	"unknown"	"nVidia Corporation|CK8S Parallel ATA Controller (v2.5)"
+0x10de	0x00e6	"forcedeth"	"nVidia Corp.|Ethernet adapter"
+0x10de	0x00e7	"unknown"	"nVidia Corporation|CK8S USB Controller"
+0x10de	0x00e8	"unknown"	"nVidia Corporation|CK8S USB Controller"
+0x10de	0x00ea	"snd-intel8x0"	"nVidia Corp.|"
+0x10de	0x00ed	"unknown"	"nVidia Corporation|nForce3 250Gb PCI-to-PCI Bridge"
+0x10de	0x00ee	"sata_nv"	"nVidia Corp.|"
+0x10de	0x00f0	"unknown"	"nVidia Corporation|NV40 [GeForce 6800/GeForce 6800 Ultra]"
+0x10de	0x00f1	"unknown"	"nVidia Corporation|NV43 [GeForce 6600/GeForce 6600 GT]"
+0x10de	0x00f2	"unknown"	"nVidia Corporation|NV43 [GeForce 6600 GT]"
+0x10de	0x00f8	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV45GL [Quadro FX 3400 PCI-Express]"
+0x10de	0x00f9	"unknown"	"nVidia Corporation|NV40 [GeForce 6800 Ultra]"
+0x10de	0x00fa	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV36 [GeForce FX 5750 PCI-Express]"
+0x10de	0x00fb	"unknown"	"nVidia Corporation|NV35 [GeForce PCX 5900]"
+0x10de	0x00fc	"unknown"	"nVidia Corporation|NV37GL [Quadro FX 330/GeForce PCX 5300]"
+0x10de	0x00fd	"unknown"	"nVidia Corporation|NV37GL [Quadro FX 330]"
+0x10de	0x00fe	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV38GL [Quadro FX 1300 PCI-Express]"
+0x10de	0x00ff	"unknown"	"nVidia Corporation|NV18 [GeForce PCX 4300]"
+0x10de	0x0100	"Card:NVIDIA GeForce 256 (generic)"	"nVidia Corp.|GeForce 256"
+0x10de	0x0101	"Card:NVIDIA GeForce 256 (generic)"	"nVidia Corp.|GeForce DDR"
+0x10de	0x0102	"Card:NVIDIA GeForce 256 (generic)"	"nVidia Corp.|NV10 GeForce 256 Ultra"
+0x10de	0x0103	"Card:NVIDIA GeForce 256 (generic)"	"nVidia Corp.|Quadro"
+0x10de	0x0110	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corp.|NV11 Geforce2 MX/MX 400"
+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	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)"
+0x10de	0x0153	"Card:NVIDIA GeForce2 DDR (generic)"	"nVidia Corp.|NV15 Quadro2 Pro"
+0x10de	0x0170	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17 GeForce4 MX 460"
+0x10de	0x0171	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17 GeForce4 MX 440"
+0x10de	0x0172	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17 GeForce4 MX 420"
+0x10de	0x0173	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17 GeForce4 MMX 440-SE"
+0x10de	0x0174	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17M GeForce4 440 Go"
+0x10de	0x0175	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17M GeForce4 420 Go"
+0x10de	0x0176	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17M GeForce4 420 Go 32M"
+0x10de	0x0177	"Card:NVIDIA GeForce4 (generic)"	"NVIDIA Corp.|NV17M GeForce4 460 Go"
+0x10de	0x0178	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17GL Quadro4 500XGL"
+0x10de	0x0179	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17M GeForce4 440 Go 64M"
+0x10de	0x017a	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17GL Quadro4 200/400NVS"
+0x10de	0x017b	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17GL Quadro4 550XGL"
+0x10de	0x017c	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17M-GL Quadro4 500 GoGL"
+0x10de	0x017d	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV17M GeForce4 410 Go 16M"
+0x10de	0x0181	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV18 GeForce4 MX440 AGP 8x"
+0x10de	0x0182	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV18 GeForce4 MX440SE AGP 8x"
+0x10de	0x0183	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV18 GeForce4 MX420 AGP 8x"
+0x10de	0x0185	"Card:NVIDIA GeForce4 (generic)"	"NVIDIA Corp.|NV18.6? GeForce4 MX 4000"
+0x10de	0x0186	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV18 GeForce4 448 Go"
+0x10de	0x0187	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV18 GeForce4 488 Go"
+0x10de	0x0188	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV18 Quadro4 580 XGL"
+0x10de	0x018a	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV18 Quadro4 280 NVS"
+0x10de	0x018b	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|NV18 Quadro4 380 XGL"
+0x10de	0x018d	"unknown"	"nVidia Corporation|NV18M [GeForce4 448 Go]"
+0x10de	0x01a0	"Card:NVIDIA GeForce2 Integrated (generic)"	"nVidia|GeForce2 Integrated GPU"
+0x10de	0x01a4	"nvidia-agp"	"nVidia Corp.|nForce AGP Controller"
+0x10de	0x01a5	"unknown"	"nVidia Corp.|nForce AGP Controller"
+0x10de	0x01a6	"unknown"	"nVidia Corp.|nForce AGP Controller"
+0x10de	0x01a8	"unknown"	"nVidia Corp.|nForce 220 Memory Controller (SDR)"
+0x10de	0x01a9	"unknown"	"nVidia Corp.|nForce 420 Memory Controller (SDR)"
+0x10de	0x01aa	"unknown"	"nVidia Corp.|nForce 220 Memory Controller (DDR)"
+0x10de	0x01ab	"unknown"	"nVidia Corp.|nForce 420 Memory Controller (DDR)"
+0x10de	0x01ac	"unknown"	"nVidia Corp.|nForce 220/420 Memory Controller"
+0x10de	0x01ad	"forcedeth"	"nVidia Corp.|nForce Ethernet Controller"
+0x10de	0x01b0	"unknown"	"nVidia Corp.|nForce MCP Audio Processing Unit (Dolby Digital)"
+0x10de	0x01b1	"snd-intel8x0"	"nVidia Corp.|nForce Audio Codec Interface"
+0x10de	0x01b2	"unknown"	"nVidia Corp.|nForce Joystick"
+0x10de	0x01b4	"i2c-amd756"	"nVidia Corp.|nForce SMBus Controller"
+0x10de	0x01b7	"unknown"	"nVidia Corp.|nForce AGP Host to PCI Bridge"
+0x10de	0x01b8	"unknown"	"nVidia Corp.|nForce PCI Bridge"
+0x10de	0x01bc	"unknown"	"nVidia Corp.|nForce ATA Controller"
+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	0x01da	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corporation|NV36 [Quadro FX 1100]"
+0x10de	0x01e0	"nvidia-agp"	"nVidia Corp.|nForce2 AGP Controller"
+0x10de	0x01e1	"unknown"	"NVIDIA Corp.|nForce2 AGP Controller"
+0x10de	0x01e8	"unknown"	"nVidia Corp.|nForce2 AGP Host to PCI Bridge"
+0x10de	0x01ea	"unknown"	"NVIDIA Corp.|nForce2 Memory Controller 0"
+0x10de	0x01eb	"unknown"	"nVidia Corp.|nForce2 Memory Controller"
+0x10de	0x01ec	"unknown"	"nVidia Corp.|nForce2 Memory Controller"
+0x10de	0x01ed	"unknown"	"nVidia Corp.|nForce2 Memory Controller"
+0x10de	0x01ee	"unknown"	"nVidia Corp.|nForce2 Memory Controller"
+0x10de	0x01ef	"unknown"	"nVidia Corp.|nForce2 Memory Controller"
+0x10de	0x01f0	"Card:NVIDIA GeForce4 (generic)"	"nVidia Corp.|nForce2 Geforce 4 Integrated"
+0x10de	0x0200	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corp.|GeForce3"
+0x10de	0x0201	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corp.|GeForce3 Ti 200"
+0x10de	0x0202	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corp.|GeForce3 Ti 500"
+0x10de	0x0203	"Card:NVIDIA GeForce3 (generic)"	"nVidia Corp.|Quadro DDC"
+0x10de	0x0240	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x0241	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x0242	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+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"
+0x10de	0x0246	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x0247	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x0248	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x0249	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x024a	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x024b	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x024c	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x024d	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x024e	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x024f	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x0250	"Card:NVIDIA GeForce4 (generic)"	"nVidia|NV25 GeForce4 Ti4600"
+0x10de	0x0251	"Card:NVIDIA GeForce4 (generic)"	"nVidia|NV25 GeForce4 Ti4400"
+0x10de	0x0252	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x252"
+0x10de	0x0253	"Card:NVIDIA GeForce4 (generic)"	"nVidia|NV25 GeForce4 Ti4200"
+0x10de	0x0258	"Card:NVIDIA GeForce4 (generic)"	"nVidia|Quadro4 900 XGL"
+0x10de	0x0259	"Card:NVIDIA GeForce4 (generic)"	"nVidia|Quadro4 750 XGL"
+0x10de	0x025b	"Card:NVIDIA GeForce4 (generic)"	"nVidia|Quadro4 750 XGL"
+0x10de	0x0260	"unknown"	"nVidia Corporation|MCP51 LPC Bridge"
+0x10de	0x0261	"unknown"	"nVidia Corporation|MCP51 LPC Bridge"
+0x10de	0x0262	"unknown"	"nVidia Corporation|MCP51 LPC Bridge"
+0x10de	0x0263	"unknown"	"nVidia Corporation|MCP51 LPC Bridge"
+0x10de	0x0264	"unknown"	"nVidia Corporation|MCP51 SMBus"
+0x10de	0x0265	"amd74xx"	"nVidia Corporation|MCP51 IDE"
+0x10de	0x0266	"sata_nv"	"nVidia Corporation|MCP51 Serial ATA Controller"
+0x10de	0x0267	"sata_nv"	"nVidia Corporation|MCP51 Serial ATA Controller"
+0x10de	0x0268	"forcedeth_ng"	"nVidia Corp.|MCP51 Ethernet Controller"
+0x10de	0x0269	"forcedeth_ng"	"nVidia Corp.|MCP51 Ethernet Controller"
+0x10de	0x026a	"unknown"	"nVidia Corporation|MCP51 MCI"
+0x10de	0x026b	"unknown"	"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"
+0x10de	0x026f	"unknown"	"nVidia Corporation|MCP51 PCI Bridge"
+0x10de	0x0270	"unknown"	"nVidia Corporation|MCP51 Host Bridge"
+0x10de	0x0271	"unknown"	"nVidia Corporation|MCP51 PMU"
+0x10de	0x0272	"unknown"	"nVidia Corporation|MCP51 Memory Controller 0"
+0x10de	0x027e	"unknown"	"nVidia Corporation|C51 Memory Controller 2"
+0x10de	0x027f	"unknown"	"nVidia Corporation|C51 Memory Controller 3"
+0x10de	0x0280	"Card:NVIDIA GeForce4 (generic)"	"nVidia|GeForce4 Ti 4800"
+0x10de	0x0281	"Card:NVIDIA GeForce4 (generic)"	"nVidia|GeForce4 Ti 4200 with AGP8X"
+0x10de	0x0282	"Card:NVIDIA GeForce4 (generic)"	"nVidia|GeForce4 Ti 4800 SE"
+0x10de	0x0286	"Card:NVIDIA GeForce4 (generic)"	"nVidia|GeForce4 Ti 4200 Go"
+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	0x02a0	"Card:NVIDIA GeForce3 (generic)"	"nVidia|GeForce3 Integrated (Xbox)"
+0x10de	0x02f0	"unknown"	"nVidia Corporation|C51 Host Bridge"
+0x10de	0x02f1	"unknown"	"nVidia Corporation|C51 Host Bridge"
+0x10de	0x02f2	"unknown"	"nVidia Corporation|C51 Host Bridge"
+0x10de	0x02f3	"unknown"	"nVidia Corporation|C51 Host Bridge"
+0x10de	0x02f4	"unknown"	"nVidia Corporation|C51 Host Bridge"
+0x10de	0x02f5	"unknown"	"nVidia Corporation|C51 Host Bridge"
+0x10de	0x02f6	"unknown"	"nVidia Corporation|C51 Host Bridge"
+0x10de	0x02f7	"unknown"	"nVidia Corporation|C51 Host Bridge"
+0x10de	0x02f8	"unknown"	"nVidia Corporation|C51 Memory Controller 5"
+0x10de	0x02f9	"unknown"	"nVidia Corporation|C51 Memory Controller 4"
+0x10de	0x02fa	"unknown"	"nVidia Corporation|C51 Memory Controller 0"
+0x10de	0x02fb	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x02fc	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x02fd	"unknown"	"nVidia Corporation|C51 PCI Express Bridge"
+0x10de	0x02fe	"unknown"	"nVidia Corporation|C51 Memory Controller 1"
+0x10de	0x02ff	"unknown"	"nVidia Corporation|C51 Host Bridge"
+0x10de	0x0300	"Card:NVIDIA GeForce FX (generic)"	"nVidia|NV30 GeForce FX"
+0x10de	0x0301	"Card:NVIDIA GeForce FX (generic)"	"nVidia|GeForce FX 5800 Ultra"
+0x10de	0x0302	"Card:NVIDIA GeForce FX (generic)"	"nVidia|GeForce FX 5800"
+0x10de	0x0308	"Card:NVIDIA GeForce FX (generic)"	"nVidia|Quadro FX 2000"
+0x10de	0x0309	"Card:NVIDIA GeForce FX (generic)"	"nVidia|Quadro FX 1000"
+0x10de	0x0311	"Card:NVIDIA GeForce FX (generic)"	"nVidia|GeForce FX 5600"
+0x10de	0x0312	"Card:NVIDIA GeForce FX (generic)"	"nVidia|GeForce FX 5600"
+0x10de	0x0313	"unknown"	"nVidia Corporation|NV31"
+0x10de	0x0314	"Card:NVIDIA GeForce FX (generic)"	"NVIDIA Corp.|NV31 GeForce FX 5600XT"
+0x10de	0x0316	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x316"
+0x10de	0x0317	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x317"
+0x10de	0x0318	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x318"
+0x10de	0x0319	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x319"
+0x10de	0x031a	"Card:NVIDIA GeForce FX (generic)"	"NVIDIA Corp.|NV31 GeForce Go 5600"
+0x10de	0x031b	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x31B"
+0x10de	0x031c	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x31C"
+0x10de	0x031d	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x31D"
+0x10de	0x031e	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x31E"
+0x10de	0x031f	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x31F"
+0x10de	0x0320	"unknown"	"nVidia Corporation|NV34 [GeForce FX 5200]"
+0x10de	0x0321	"Card:NVIDIA GeForce FX (generic)"	"nVidia|GeForce FX 5200 Ultra"
+0x10de	0x0322	"Card:NVIDIA GeForce FX (generic)"	"nVidia|GeForce FX 5200"
+0x10de	0x0323	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x323"
+0x10de	0x0324	"Card:NVIDIA GeForce FX (generic)"	"nVidia|NV30GL [GeForce FX 5200 Go]"
+0x10de	0x0325	"unknown"	"NVIDIA Corp.|??? GeForce FX Go 5250"
+0x10de	0x0326	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x326"
+0x10de	0x0327	"unknown"	"nVidia Corporation|NV34 [GeForce FX 5100]"
+0x10de	0x0328	"Card:NVIDIA GeForce FX (generic)"	"nVidia|GeForce FX Go 5200"
+0x10de	0x0329	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV34M [GeForce FX Go5200]"
+0x10de	0x032a	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x32A"
+0x10de	0x032b	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x32B"
+0x10de	0x032c	"Card:NVIDIA GeForce FX (generic)"	"NVIDIA Corp.|??? NVIDIA GeForce FX Go 5300"
+0x10de	0x032d	"unknown"	"nVidia Corporation|NV34 [GeForce FX Go5100]"
+0x10de	0x032e	"Card:NVIDIA GeForce4 (generic)"	"nVidia|0x32E"
+0x10de	0x032f	"unknown"	"NVIDIA Corp.|NV34GL ???"
+0x10de	0x0330	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV35 [GeForce FX 5900 Ultra]"
+0x10de	0x0331	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV35 [GeForce FX 5900]"
+0x10de	0x0332	"Card:NVIDIA GeForce FX (generic)"	"NVIDIA Corp.|??? GeForce FX 5900XT"
+0x10de	0x0333	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV38 [GeForce FX 5950]"
+0x10de	0x0334	"unknown"	"nVidia Corporation|NV35 [GeForce FX 5900ZT]"
+0x10de	0x0338	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV35GL [Quadro FX 3000]"
+0x10de	0x033f	"unknown"	"nVidia Corporation|NV35GL [Quadro FX 700]"
+0x10de	0x0341	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV36 [GeForce FX 5700 Ultra]"
+0x10de	0x0342	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV36 [GeForce FX 5700]"
+0x10de	0x0343	"unknown"	"nVidia Corporation|NV36 [GeForce FX 5700LE]"
+0x10de	0x0344	"unknown"	"nVidia Corporation|NV36.4 [GeForce FX 5700VE]"
+0x10de	0x0345	"unknown"	"nVidia Corporation|NV36.5"
+0x10de	0x0347	"unknown"	"nVidia Corporation|NV36 [GeForce FX Go5700]"
+0x10de	0x0348	"unknown"	"nVidia Corporation|NV36 [GeForce FX Go5700]"
+0x10de	0x0349	"unknown"	"nVidia Corporation|NV36"
+0x10de	0x034b	"unknown"	"nVidia Corporation|NV36"
+0x10de	0x034c	"unknown"	"nVidia Corporation|NV36 [Quadro FX Go1000]"
+0x10de	0x034e	"Card:NVIDIA GeForce FX (generic)"	"nVidia Corp.|NV36 [Quadro FX 1100]"
+0x10de	0x034f	"unknown"	"nVidia Corporation|NV36GL"
+0x10de	0x0372	"forcedeth_ng"	"nVidia Corp.|MCP55 Ethernet"
+0x10de	0x0373	"forcedeth_ng"	"nVidia Corp.|MCP55 Ethernet"
+0x10df	0x10df	"unknown"	"Emulex Corp.|Light Pulse Fibre Channel Adapter"
+0x10df	0x1ae5	"unknown"	"Emulex Corp.|LP6000 Fibre Channel Host Adapter"
+0x10df	0x1ae6	"unknown"	"Emulex Corp.|LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)"
+0x10df	0x1ae7	"unknown"	"Emulex Corp.|LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:2-3)"
+0x10df	0xf015	"unknown"	"Emulex Corporation|LP1150e"
+0x10df	0xf085	"unknown"	"Emulex Corp.|LP850 Fibre Channel Adapter"
+0x10df	0xf095	"unknown"	"Emulex Corp.|LP952 Fibre Channel Adapter"
+0x10df	0xf098	"unknown"	"Emulex Corp.|LP982 Fibre Channel Adapter"
+0x10df	0xf0a5	"lpfcdd"	"Emulex Corp.|LP1050 Fibre Channel Host Adapter"
+0x10df	0xf0d5	"unknown"	"Emulex Corporation|LP1150"
+0x10df	0xf100	"unknown"	"Emulex Corporation|LP11000e"
+0x10df	0xf700	"lpfcdd"	"Emulex Corp.|LP7000 Fibre Channel Host Adapter"
+0x10df	0xf701	"unknown"	"Emulex Corp.|LP 7000EFibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)"
+0x10df	0xf800	"lpfcdd"	"Emulex Corp.|LP8000 Fibre Channel Host Adapter"
+0x10df	0xf801	"unknown"	"Emulex Corp.|LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)"
+0x10df	0xf900	"lpfcdd"	"Emulex Corp.|LP9000 Fibre Channel Host Adapter"
+0x10df	0xf901	"unknown"	"Emulex Corp.|LP 9000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)"
+0x10df	0xf980	"lpfcdd"	"Emulex Corp.|LP9802 Fibre Channel Host Adapter"
+0x10df	0xf981	"unknown"	"Emulex Corp.|LP 9802 Fibre Channel Host Adapter Alternate ID"
+0x10df	0xf982	"unknown"	"Emulex Corp.|LP 9802 Fibre Channel Host Adapter Alternate ID"
+0x10df	0xfa00	"lpfcdd"	"Emulex Corp.|LP10000 Fibre Channel Adapter"
+0x10df	0xfa01	"unknown"	"Emulex Corporation|LP101"
+0x10df	0xfd00	"unknown"	"Emulex Corporation|LP11000"
 0x10e0	0x5026	"unknown"	"Integrated Micro|IMS5026/27/28"
 0x10e0	0x5027	"unknown"	"Integrated Micro|IMS5027"
 0x10e0	0x5028	"unknown"	"Integrated Micro|IMS5028"
@@ -2270,7 +2564,7 @@
 0x10e1	0x690c	"unknown"	"Tekram|DC-690c"
 0x10e1	0xdc20	"unknown"	"Tekram Technology Corp. Ltd.|DC-290 EIDE Controller"
 0x10e1	0xdc29	"unknown"	"Tekram|DC-290"
-0x10e3	0x0000	"Server:SVGA"	"Tundra Semiconductor Corp.|CA91C042 [Universe]"
+0x10e3	0x0000	"unknown"	"Tundra Semiconductor Corp.|CA91C042 [Universe]"
 0x10e3	0x0513	"unknown"	"Tundra Semiconductor Corp.|Tsi320 Dual-Mode PCI-to-PCI Bus Bridge"
 0x10e3	0x0850	"unknown"	"Tundra Semiconductor Corp.|Tsi850 Power PC Dual PCI Host Bridge"
 0x10e3	0x0854	"unknown"	"Tundra Semiconductor Corp.|Tsi850 Power PC Single PCI Host Bridge"
@@ -2282,7 +2576,7 @@
 0x10e8	0x2011	"unknown"	"Applied Micro|Q-Motion Video Capture/Edit board"
 0x10e8	0x4750	"unknown"	"Applied Micro|S5930 [Matchmaker]"
 0x10e8	0x5920	"unknown"	"Applied Micro|S5920"
-0x10e8	0x8001	"unknown"	"Applied Micro Circuits Corporation (AMCC)|S5933 Daktronics VMax transmitter card"
+0x10e8	0x8001	"unknown"	"Applied Micro Circuits Corp. (AMCC)|S5933 Daktronics VMax transmitter card"
 0x10e8	0x8033	"unknown"	"Applied Micro Circuits Corp.|BBK-PCI light Transputer Link Interface"
 0x10e8	0x8043	"unknown"	"Applied Micro|LANai4.x [Myrinet LANai interface chip]"
 0x10e8	0x8062	"unknown"	"Applied Micro|S5933_PARASTATION"
@@ -2296,12 +2590,12 @@
 0x10e8	0x80da	"unknown"	"Applied Micro|PCI-9812"
 0x10e8	0x811a	"unknown"	"Applied Micro|PCI-IEEE1355-DS-DE Interface"
 0x10e8	0x8170	"unknown"	"Applied Micro|S5933 Matchmaker PCI Chipset Development Tool"
-0x10e8	0x81b7	"unknown"	"Applied Micro Circuits Corporation (AMCC)|S5933 AJAVideo NTV ITU-R.601 video stillstore"
+0x10e8	0x81b7	"unknown"	"Applied Micro Circuits Corp. (AMCC)|S5933 AJAVideo NTV ITU-R.601 video stillstore"
 0x10e8	0x81db	"unknown"	"Applied Micro|AJA HDNTV HD SDI Framestore"
 0x10e8	0x82db	"unknown"	"Applied Micro Circuits Corp.|AJA HDNTV HD SDI Framestore"
 0x10e8	0x8851	"unknown"	"Applied Micro Circuits Corp.|S5933 on Innes Corp FM Radio Capture card"
-0x10ea	0x1680	"Server:SVGA"	"Intergraphics Systems|IGA-1680"
-0x10ea	0x1682	"Server:SVGA"	"Intergraphics Systems|IGA-1682"
+0x10ea	0x1680	"unknown"	"Intergraphics Systems|IGA-1680"
+0x10ea	0x1682	"unknown"	"Intergraphics Systems|IGA-1682"
 0x10ea	0x1683	"unknown"	"Intergraphics Systems|IGA-1683"
 0x10ea	0x2000	"cyber2000fb"	"Intergraphics Systems|CyberPro 2000"
 0x10ea	0x2010	"cyber2000fb"	"Intergraphics Systems|CyberPro 2000A"
@@ -2319,28 +2613,28 @@
 0x10ec	0x8139	"8139too"	"Realtek|RTL-8139"
 0x10ec	0x8169	"r8169"	"Realtek|RTL-8169"
 0x10ec	0x8180	"unknown"	"Realtek Semiconductor|RTL8180 Realtek RTL8180 Wireless LAN (Mini-)PCI NIC"
-0x10ec	0x8197	"unknown"	"Realtek Semiconductor Co., Ltd.|SmartLAN56 56K Modem"
-0x10ed	0x7310	"unknown"	"Ascii Corporation|V7310"
-0x10ee	0x0000	"unknown"	"Xilinx Corporation|8343176 PCI to H.100 audio interface"
-0x10ee	0x1001	"unknown"	"Xilinx Corporation|8343176 PCI to H.100 audio interface"
+0x10ec	0x8197	"slamr"	"Realtek Semiconductor Co., Ltd.|SmartLAN56 56K Modem"
+0x10ed	0x7310	"unknown"	"Ascii Corp.|V7310"
+0x10ee	0x0000	"unknown"	"Xilinx Corp.|8343176 PCI to H.100 audio interface"
+0x10ee	0x1001	"unknown"	"Xilinx Corp.|8343176 PCI to H.100 audio interface"
 0x10ee	0x3fc0	"snd-rme96"	"Xilinx, Inc.|RME Digi96"
 0x10ee	0x3fc1	"snd-rme96"	"Xilinx, Inc.|RME Digi96/8"
 0x10ee	0x3fc2	"snd-rme96"	"Xilinx, Inc.|RME Digi96/8 Pro"
 0x10ee	0x3fc3	"snd-rme96"	"Xilinx, Inc.|RME Digi96/8 Pad"
 0x10ee	0x3fc4	"rme96xx"	"Xilinx, Inc.|Digi9652 Hammerfall"
 0x10ee	0x3fc5	"snd-hdsp"	"Xilinx, Inc.|RME Hammerfall DSP"
-0x10ee	0x3fc6	"unknown"	"Xilinx Corporation|RME Hammerfall DSP MADI"
+0x10ee	0x3fc6	"unknown"	"Xilinx Corp.|RME Hammerfall DSP MADI"
 0x10ee	0x4020	"ISDN:tpam"	"Xilinx, Inc.| ISDN Adapter"
 0x10ee	0x5343	"unknown"	"Xilinx, Inc|Seamont SC100 Security Adapter"
 0x10ee	0x8130	"unknown"	"Xilinx, Inc|Durango PMC Virtex-II Bridge, XC2V1000-4FG456C"
-0x10ee	0x8381	"unknown"	"Xilinx Corporation|Ellips Santos Frame Grabber"
+0x10ee	0x8381	"unknown"	"Xilinx Corp.|Ellips Santos Frame Grabber"
 0x10ef	0x8154	"unknown"	"Racore Computer Products, Inc.|M815x Token Ring Adapter"
-0x10f0	0xa800	"unknown"	"Peritek Corporation|VCL-P Graphics board"
-0x10f0	0xb300	"unknown"	"Peritek Corporation|VCL-M graphics board"
+0x10f0	0xa800	"unknown"	"Peritek Corp.|VCL-P Graphics board"
+0x10f0	0xb300	"unknown"	"Peritek Corp.|VCL-M graphics board"
 0x10f1	0x1566	"unknown"	"Tyan Computer|IDE/SCSI"
 0x10f1	0x1677	"unknown"	"Tyan Computer|Multimedia"
 0x10f4	0x1300	"unknown"	"S-Mos Systems|rev1.1 PCI to S5U13x06B0B Bridge Adapter"
-0x10f5	0xa001	"unknown"	"NKK Corporation|NDR4000 [NR4600 Bridge]"
+0x10f5	0xa001	"unknown"	"NKK Corp.|NDR4000 [NR4600 Bridge]"
 0x10fa	0x0000	"unknown"	"TrueVision|GUI Accelerator"
 0x10fa	0x0001	"unknown"	"TrueVision|GUI Accelerator"
 0x10fa	0x0002	"unknown"	"TrueVision|GUI Accelerator"
@@ -2366,13 +2660,14 @@
 0x10fb	0x186f	"unknown"	"Thesys Gesellschaft für Mikroelektronik mbH|TH 6255"
 0x10fc	0x0003	"unknown"	"I-O Data Device, Inc.|Cardbus IDE Controller"
 0x10fc	0x0005	"nsp32"	"I-O Data Device, Inc.|Cardbus SCSI CBSC II"
-0x1101	0x0002	"initio"	"Initio Corporation|Ultra SCSI Adapter"
-0x1101	0x1060	"initio"	"Initio Corporation|INI-A100U2W"
-0x1101	0x134a	"initio"	"Initio Corporation|Ultra SCSI Adapter"
-0x1101	0x9100	"initio"	"Initio Corporation|INI-9100/9100W"
-0x1101	0x9400	"initio"	"Initio Corporation|INI-940"
-0x1101	0x9401	"initio"	"Initio Corporation|INI-950"
-0x1101	0x9500	"initio"	"Initio Corporation|360P"
+0x1101	0x0002	"initio"	"Initio Corp.|Ultra SCSI Adapter"
+0x1101	0x1060	"a100u2w"	"Initio Corp.|INI-A100U2W"
+0x1101	0x134a	"initio"	"Initio Corp.|Ultra SCSI Adapter"
+0x1101	0x9100	"initio"	"Initio Corp.|INI-9100/9100W"
+0x1101	0x9400	"initio"	"Initio Corp.|INI-940"
+0x1101	0x9401	"initio"	"Initio Corp.|INI-950"
+0x1101	0x9500	"initio"	"Initio Corp.|360P"
+0x1101	0x9502	"unknown"	"Initio Corp.|Initio INI-9100UW Ultra Wide SCSI Controller INIC-950P chip"
 0x1101	0x9700	"initio"	"Initio Corp|Fast Wide SCSI Controller"
 0x1102	0x0002	"snd-emu10k1"	"Creative Labs|SB Live! (audio)"
 0x1102	0x0003	"unknown"	"Creative Labs|EMU8008 AWE64D OEM (CT4600)"
@@ -2413,10 +2708,11 @@
 0x1106	0x0130	"unknown"	"VIA Technologies Inc|VT6305 1394.A OHCI Link Layer Controller"
 0x1106	0x0198	"via-agp"	"VIA Technologies Inc|CPU to PCI Bridge"
 0x1106	0x0204	"amd64-agp"	"VIA Technologies Inc|CPU to PCI Bridge"
-0x1106	0x0238	"unknown"	"VIA Technologies Inc|K8T890 CPU to PCI Bridge"
+0x1106	0x0238	"amd64-agp"	"VIA Technologies Inc|K8T890 CPU to PCI Bridge"
 0x1106	0x0259	"via-agp"	"VIA Technologies Inc|CPU to PCI Bridge"
-0x1106	0x0269	"unknown"	"VIA Technologies Inc|KT880 CPU to PCI Bridge"
-0x1106	0x0282	"unknown"	"VIA Technologies Inc|K8T880Pro CPU to PCI Bridge"
+0x1106	0x0269	"via-agp"	"VIA Technologies Inc|KT880 CPU to PCI Bridge"
+0x1106	0x0282	"amd64-agp"	"VIA Technologies Inc|K8T880Pro CPU to PCI Bridge"
+0x1106	0x0296	"via-agp"	"VIA Technologies Inc|"
 0x1106	0x0305	"via-agp"	"VIA Technologies|VT8363/8365 [KT133/KM133]"
 0x1106	0x0391	"via-agp"	"VIA Technologies|VT8371 [KX133]"
 0x1106	0x0501	"via-agp"	"VIA Technologies|VT8501"
@@ -2449,18 +2745,19 @@
 0x1106	0x2238	"unknown"	"VIA Technologies Inc|K8T890 CPU to PCI Bridge"
 0x1106	0x2269	"unknown"	"VIA Technologies Inc|KT880 CPU to PCI Bridge"
 0x1106	0x2282	"unknown"	"VIA Technologies Inc|K8T880Pro CPU to PCI Bridge"
+0x1106	0x3022	"unknown"	"VIA Technologies, Inc.|CLE266"
 0x1106	0x3038	"usb-uhci"	"VIA Technologies|VT82C586B USB"
-0x1106	0x3040	"unknown"	"VIA Technologies|VT82C586B ACPI"
+0x1106	0x3040	"i2c-via"	"VIA Technologies|VT82C586B ACPI"
 0x1106	0x3043	"via-rhine"	"VIA Technologies|VT86C100A [Rhine 10/100]"
 0x1106	0x3044	"ohci1394"	"VIA Technologies|OHCI Compliant IEEE 1394 Host Controller"
-0x1106	0x3050	"unknown"	"VIA Technologies Inc|Power Management Controller"
-0x1106	0x3051	"unknown"	"VIA Technologies Inc|Power Management Controller"
+0x1106	0x3050	"i2c-viapro"	"VIA Technologies Inc|Power Management Controller"
+0x1106	0x3051	"i2c-viapro"	"VIA Technologies Inc|Power Management Controller"
 0x1106	0x3053	"via-rhine"	"VIA Technologies|VT6105M [Rhine III 10/100]"
-0x1106	0x3057	"unknown"	"VIA Technologies|VT82C686 [Apollo Super ACPI]"
+0x1106	0x3057	"i2c-viapro"	"VIA Technologies|VT82C686 [Apollo Super ACPI]"
 0x1106	0x3058	"snd-via82xx"	"VIA Technologies|VT82C686 [Apollo Super AC97/Audio]"
-0x1106	0x3059	"snd-via82xx"	"VIA Technologies|VT8233 [AC97 Audio Controller]"
+0x1106	0x3059	"via82cxxx_audio"	"VIA Technologies|VT8233 [AC97 Audio Controller]"
 0x1106	0x3065	"via-rhine"	"VIA Technologies|VT6102 [Rhine II 10/100]"
-0x1106	0x3068	"Bad:www.linmodems.org"	"VIA Technologies|VT82C686 [Apollo Super AC97/Modem]"
+0x1106	0x3068	"slamr"	"VIA Technologies|VT82C686 [Apollo Super AC97/Modem]"
 0x1106	0x3074	"via-ircc"	"VIA Technologies|VT8233 PCI to ISA Bridge"
 0x1106	0x3086	"unknown"	"VIA Technologies Inc|VT82C686 Power management"
 0x1106	0x3091	"via-agp"	"VIA Technologies|VT8633 [Apollo Pro266]"
@@ -2470,10 +2767,12 @@
 0x1106	0x3103	"unknown"	"VIA Technologies Inc|VT8615 CPU to PCI Bridge"
 0x1106	0x3104	"ehci-hcd"	"VIA Technologies Inc|VT8235 USB Enhanced Controller"
 0x1106	0x3106	"via-rhine"	"VIA Technologies|VT6105 [Rhine III 10/100]"
+0x1106	0x3108	"unknown"	"VIA Technologies, Inc.|S3 Unichrome Pro VGA Adapter"
 0x1106	0x3109	"via-ircc"	"VIA Technologies|VT8233C PCI to ISA Bridge"
 0x1106	0x3112	"via-agp"	"VIA Technologies Inc|VT8361 CPU to PCI Bridge"
 0x1106	0x3113	"unknown"	"VIA Technologies Inc|PCI to PCI Bridge"
 0x1106	0x3116	"via-agp"	"VIA Technologies Inc|CPU-to-PCI Bridge"
+0x1106	0x3118	"unknown"	"VIA Technologies, Inc.|S3 Unichrome Pro VGA Adapter"
 0x1106	0x3119	"unknown"	"VIA Technologies Inc|VT3119 Gigabit Ethernet Controller"
 0x1106	0x3122	"unknown"	"VIA Technologies, Inc.|VT8623 [Apollo CLE266] integrated CastleRock graphics"
 0x1106	0x3123	"via-agp"	"VIA Technologies Inc|VT8623 CPU to PCI Bridge"
@@ -2497,12 +2796,13 @@
 0x1106	0x3208	"via-agp"	"VIA Technologies Inc|CPU to PCI Bridge"
 0x1106	0x3209	"unknown"	"VIA Technologies Inc|CPU to PCI Bridge"
 0x1106	0x3213	"unknown"	"VIA Technologies Inc|PCI to PCI Bridge"
-0x1106	0x3227	"unknown"	"VIA Technologies Inc|VT8237 PCI-to-ISA Bridge"
+0x1106	0x3227	"i2c-viapro"	"VIA Technologies Inc|VT8237 PCI-to-ISA Bridge"
 0x1106	0x3238	"unknown"	"VIA Technologies Inc|K8T890 CPU-to-PCI Bridge"
 0x1106	0x3258	"via-agp"	"VIA Technologies Inc|PCI to PCI Bridge"
 0x1106	0x3259	"unknown"	"VIA Technologies Inc|??? CPU to PCI Bridge"
 0x1106	0x3269	"unknown"	"VIA Technologies Inc|KT880 CPU to PCI Bridge"
 0x1106	0x3282	"unknown"	"VIA Technologies Inc|K8T880Pro CPU to PCI Bridge"
+0x1106	0x4149	"unknown"	"VIA Technologies, Inc.|VIA VT6420 (ATA133) Controller"
 0x1106	0x4204	"unknown"	"VIA Technologies Inc|??? CPU to PCI Bridge"
 0x1106	0x4238	"unknown"	"VIA Technologies Inc|??? CPU to PCI Bridge"
 0x1106	0x4258	"unknown"	"VIA Technologies Inc|??? CPU to PCI Bridge"
@@ -2520,7 +2820,7 @@
 0x1106	0x7282	"unknown"	"VIA Technologies Inc|K8T880Pro CPU to PCI Bridge"
 0x1106	0x8208	"unknown"	"VIA Technologies Inc|K8T890 PCI to AGP Bridge"
 0x1106	0x8231	"via-ircc"	"VIA Technologies|VT8231 [PCI-to-ISA Bridge]"
-0x1106	0x8235	"unknown"	"VIA Technologies|VT8235 Power Management"
+0x1106	0x8235	"i2c-viapro"	"VIA Technologies|VT8235 Power Management"
 0x1106	0x8305	"unknown"	"VIA Technologies|VT8363/8365 [KT133/KM133 AGP]"
 0x1106	0x8391	"unknown"	"VIA Technologies|VT8371 [PCI-PCI Bridge]"
 0x1106	0x8501	"unknown"	"VIA Technologies|VT8501"
@@ -2550,8 +2850,8 @@
 0x1106	0xb156	"unknown"	"VIA Technologies Inc|PCI-to-PCI Bridge (AGP)"
 0x1106	0xb158	"unknown"	"VIA Technologies Inc|PCI-to-PCI Bridge (AGP)"
 0x1106	0xb168	"unknown"	"VIA Technologies Inc|PCI-to-PCI Bridge (AGP)"
-0x1106	0xb188	"unknown"	"VIA Technologies Inc|PCI-to-PCI Bridge (AGP 2.0/3.0)"
-0x1106	0xb198	"unknown"	"VIA Technologies Inc|PCI-to-PCI Bridge (AGP 2.0/3.0)"
+0x1106	0xb188	"amd64-agp"	"VIA Technologies Inc|PCI-to-PCI Bridge (AGP 2.0/3.0)"
+0x1106	0xb198	"via-agp"	"VIA Technologies Inc|PCI-to-PCI Bridge (AGP 2.0/3.0)"
 0x1106	0xb213	"unknown"	"VIA Technologies Inc|I/O APIC"
 0x1106	0xc208	"unknown"	"VIA Technologies Inc|PT890 PCI-to-PCI Bridge"
 0x1106	0xc238	"unknown"	"VIA Technologies Inc|K8T890 PCI-to-PCI Bridge"
@@ -2611,6 +2911,7 @@
 0x1113	0x5105	"unknown"	"Accton|10Mbps Network card"
 0x1113	0x9211	"unknown"	"Accton|EN-1207D Fast Ethernet Adapter"
 0x1113	0x9511	"tulip"	"Accton| Ethernet Adapter"
+0x1113	0xec02	"unknown"	"Accton Technology Corporation|SMC 1244TX v3"
 0x1114	0x0506	"atmel_pci"	"Atmel Corp.|"
 0x1116	0x0022	"unknown"	"Data Translation|DT3001"
 0x1116	0x0023	"unknown"	"Data Translation|DT3002"
@@ -2637,10 +2938,10 @@
 0x1119	0x000b	"gdth"	"ICP Vortex|GDT 6x25"
 0x1119	0x000c	"gdth"	"ICP Vortex|GDT 6535"
 0x1119	0x000d	"gdth"	"ICP Vortex|GDT 6555"
-0x1119	0x0010	"unknown"	"ICP Vortex|GDT 6115/6515"
-0x1119	0x0011	"unknown"	"ICP Vortex|GDT 6125/6525"
-0x1119	0x0012	"unknown"	"ICP Vortex|GDT 6535"
-0x1119	0x0013	"unknown"	"ICP Vortex|GDT 6555/6555-ECC"
+0x1119	0x0010	"gdth"	"ICP Vortex|GDT 6115/6515"
+0x1119	0x0011	"gdth"	"ICP Vortex|GDT 6125/6525"
+0x1119	0x0012	"gdth"	"ICP Vortex|GDT 6535"
+0x1119	0x0013	"gdth"	"ICP Vortex|GDT 6555/6555-ECC"
 0x1119	0x0100	"gdth"	"ICP Vortex|GDT 6117RP/6517RP"
 0x1119	0x0101	"gdth"	"ICP Vortex|GDT 6127RP/6527RP"
 0x1119	0x0102	"gdth"	"ICP Vortex|GDT 6537RP"
@@ -2695,7 +2996,7 @@
 0x1119	0x0211	"gdth"	"ICP Vortex|GDT 6x29RD"
 0x1119	0x0260	"gdth"	"ICP Vortex|GDT 7x19RN"
 0x1119	0x0261	"gdth"	"ICP Vortex|GDT 7x29RN"
-0x1119	0x02ff	"unknown"	"ICP Vortex|GDT MAXRP"
+0x1119	0x02ff	"gdth"	"ICP Vortex|GDT MAXRP"
 0x1119	0x0300	"gdth"	"ICP Vortex GDT Raid Controller"
 0x1119	0x153b	"bttv"	"ICP Vortex|TValue"
 0x1119	0xffff	"gdth"	"ICP Vortex|"
@@ -2711,6 +3012,7 @@
 0x111d	0x0001	"nicstar"	"Integrated Device Tech|IDT77211 ATM Adapter"
 0x111d	0x0003	"unknown"	"Integrated Device Technology Inc.|IDT77252 ATM Adapter"
 0x111d	0x0004	"unknown"	"Integrated Device Technology Inc.|IDT77V252 MICRO ABR SAR PCI ATM Controller"
+0x111d	0x0005	"unknown"	"Integrated Device Technology, Inc.|IDT77V222 155Mbps ATM MICRO ABR SAR Controller"
 0x111f	0x4a47	"unknown"	"Precision Digital Images|Precision MX Video engine interface"
 0x111f	0x5243	"unknown"	"Precision Digital Images|Frame capture bus interface"
 0x1123	0x153b	"bttv"	"Terratec|TV/Radio+"
@@ -2732,18 +3034,50 @@
 0x1131	0x1561	"unknown"	"Philips Semiconductors|USB 1.1 Host Controller"
 0x1131	0x1562	"unknown"	"Philips Semiconductors|ISP1561 EHCI USB 2.0 Controller"
 0x1131	0x2780	"unknown"	"Philips Semiconductors|TDA2780AQ TV deflection controller"
-0x1131	0x3400	"unknown"	"Philips Semiconductors|UCB1500 Modem"
+0x1131	0x3400	"slamr"	"Philips Semiconductors|UCB1500 Modem"
 0x1131	0x3401	"unknown"	"Philips Semiconductors|UCB1500 Multimedia Audio Device"
 0x1131	0x5400	"unknown"	"Philips Semiconductors|TriMedia TM1000/1100 Multimedia processor"
-0x1131	0x5402	"unknown"	"Philips Semiconductors|TriMedia TM-1300 Media Processor"
+0x1131	0x5402	"ISDN:capidrv"	"Philips Semiconductors|Fritz DSL ISDN/DSL Adapter"
 0x1131	0x7130	"saa7134"	"Philips Semiconductors|SAA7130 Video Broadcast Decoder"
 0x1131	0x7133	"saa7134"	"Philips Semiconductors|SAA7135HL Multi Media Capture Device"
 0x1131	0x7134	"saa7134"	"Philips Semiconductors|SAA7134"
 0x1131	0x7135	"saa7134"	"Philips Semiconductors|SAA7135 Audio+video broadcast decoder"
 0x1131	0x7145	"unknown"	"Philips Semiconductors|SAA7145"
+0x1131	0x7146	0x00a1	0x00a1	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x00a1	0xa1a0	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x110a	0x0000	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x110a	0xffff	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x1131	0x4f56	"budget-av"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x1131	0x4f61	"budget"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x114b	0x2003	"dvb-ttpci"	"Philips Semiconductors|DVRaptor Video Edit/Capture Card"
+0x1131	0x7146	0x11bd	0x0006	"dvb-ttpci"	"Philips Semiconductors|DV500 Overlay"
+0x1131	0x7146	0x11bd	0x000a	"dvb-ttpci"	"Philips Semiconductors|DV500 Overlay"
+0x1131	0x7146	0x13c2	0x0000	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x0001	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x0002	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x0003	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x0004	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x0006	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x0008	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x000a	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x1002	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x1003	"budget"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x1004	"budget"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x1005	"budget"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x100c	"budget-ci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x100f	"budget-ci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x1011	"budget-ci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x1013	"budget"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x13c2	0x1102	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x153b	0x1154	"budget-av"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x17c8	0x0101	"hexium_orion"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x17c8	0x2101	"hexium_orion"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x17c8	0x2401	"hexium_gemini"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0x17c8	0x2402	"hexium_gemini"	"Philips Semiconductors|SAA7146"
+0x1131	0x7146	0xffc2	0x0000	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
 0x1131	0x7146	"dvb-ttpci"	"Philips Semiconductors|SAA7146"
 0x1131	0x9730	"unknown"	"Philips Semiconductors|SAA9730 Ethernet controller"
-0x1133	0x7711	"unknown"	"Eicon Technology Corporation|EiconCard C91"
+0x1133	0x7711	"unknown"	"Eicon Technology Corp.|EiconCard C91"
 0x1133	0x7901	"unknown"	"Eicon|EiconCard S90"
 0x1133	0x7902	"unknown"	"Eicon|EiconCard S90"
 0x1133	0x7911	"unknown"	"Eicon|EiconCard S91"
@@ -2760,38 +3094,38 @@
 0x1133	0xe003	"unknown"	"Eicon|DIVA 20PRO_U ISDN Adapter"
 0x1133	0xe004	"ISDN:hisax,type=11"	"Eicon|DIVA 20_U ISDN Adapter"
 0x1133	0xe005	"ISDN:hisax,type=11"	"Eicon|ISDN Controller"
-0x1133	0xe006	"unknown"	"Eicon Technology Corporation|Diva CT S/T PCI"
-0x1133	0xe007	"unknown"	"Eicon Technology Corporation|Diva CT U PCI"
-0x1133	0xe008	"unknown"	"Eicon Technology Corporation|Diva CT Lite S/T PCI"
-0x1133	0xe009	"unknown"	"Eicon Technology Corporation|Diva CT Lite U PCI"
-0x1133	0xe00a	"unknown"	"Eicon Technology Corporation|Diva ISDN+V.90 PCI"
-0x1133	0xe00b	"hisax"	"Eicon Technology Corporation|DIVA 2.02"
-0x1133	0xe00c	"unknown"	"Eicon Technology Corporation|Diva 2.02 PCI U"
-0x1133	0xe00d	"unknown"	"Eicon Technology Corporation|Diva ISDN Pro 3.0 PCI"
-0x1133	0xe00e	"unknown"	"Eicon Technology Corporation|Diva ISDN+CT S/T PCI Rev 2"
+0x1133	0xe006	"unknown"	"Eicon Technology Corp.|Diva CT S/T PCI"
+0x1133	0xe007	"unknown"	"Eicon Technology Corp.|Diva CT U PCI"
+0x1133	0xe008	"unknown"	"Eicon Technology Corp.|Diva CT Lite S/T PCI"
+0x1133	0xe009	"unknown"	"Eicon Technology Corp.|Diva CT Lite U PCI"
+0x1133	0xe00a	"unknown"	"Eicon Technology Corp.|Diva ISDN+V.90 PCI"
+0x1133	0xe00b	"hisax"	"Eicon Technology Corp.|DIVA 2.02"
+0x1133	0xe00c	"unknown"	"Eicon Technology Corp.|Diva 2.02 PCI U"
+0x1133	0xe00d	"unknown"	"Eicon Technology Corp.|Diva ISDN Pro 3.0 PCI"
+0x1133	0xe00e	"unknown"	"Eicon Technology Corp.|Diva ISDN+CT S/T PCI Rev 2"
 0x1133	0xe010	"divas"	"Eicon|DIVA Server BRI-2M"
-0x1133	0xe011	"unknown"	"Eicon Technology Corporation|Diva Server BRI S/T Rev 2"
-0x1133	0xe012	"divas"	"Eicon Technology Corporation|MaestraQ DIVA Server BRI-8M"
-0x1133	0xe013	"divas"	"Eicon Technology Corporation|MaestraQ-U DIVA Server 4BRI/PCI"
+0x1133	0xe011	"unknown"	"Eicon Technology Corp.|Diva Server BRI S/T Rev 2"
+0x1133	0xe012	"divas"	"Eicon Technology Corp.|MaestraQ DIVA Server BRI-8M"
+0x1133	0xe013	"divas"	"Eicon Technology Corp.|MaestraQ-U DIVA Server 4BRI/PCI"
 0x1133	0xe014	"divas"	"Eicon|DIVA Server PRO-30M"
-0x1133	0xe015	"divas"	"Eicon Technology Corporation|Diva Server PRI-30M PCI v.2"
-0x1133	0xe016	"divas"	"Eicon Technology Corporation|Diva Server Voice 4BRI PCI"
-0x1133	0xe017	"divas"	"Eicon Technology Corporation|Diva Server Voice 4BRI PCI Rev 2"
+0x1133	0xe015	"divas"	"Eicon Technology Corp.|Diva Server PRI-30M PCI v.2"
+0x1133	0xe016	"divas"	"Eicon Technology Corp.|Diva Server Voice 4BRI PCI"
+0x1133	0xe017	"divas"	"Eicon Technology Corp.|Diva Server Voice 4BRI PCI Rev 2"
 0x1133	0xe018	"divas"	"Eicon|DIVA Server BRI-2M/-2F"
-0x1133	0xe019	"divas"	"Eicon Technology Corporation|Diva Server Voice PRI PCI Rev 2"
-0x1133	0xe01a	"divas"	"Eicon Technology Corporation|Diva Server 2FX"
-0x1133	0xe01b	"divas"	"Eicon Technology Corporation|Diva Server BRI-2M Voice Revision 2"
-0x1133	0xe01c	"unknown"	"Eicon Technology Corporation|Diva Server PRI Rev 3.0"
-0x1133	0xe01e	"unknown"	"Eicon Technology Corporation|Diva Server 2PRI"
-0x1133	0xe020	"unknown"	"Eicon Technology Corporation|Diva Server 4PRI"
-0x1133	0xe024	"unknown"	"Eicon Networks Corporation|Diva Server Analog-4P"
-0x1133	0xe028	"unknown"	"Eicon Networks Corporation|Diva Server Analog-8P"
+0x1133	0xe019	"divas"	"Eicon Technology Corp.|Diva Server Voice PRI PCI Rev 2"
+0x1133	0xe01a	"divas"	"Eicon Technology Corp.|Diva Server 2FX"
+0x1133	0xe01b	"divas"	"Eicon Technology Corp.|Diva Server BRI-2M Voice Revision 2"
+0x1133	0xe01c	"unknown"	"Eicon Technology Corp.|Diva Server PRI Rev 3.0"
+0x1133	0xe01e	"unknown"	"Eicon Technology Corp.|Diva Server 2PRI"
+0x1133	0xe020	"unknown"	"Eicon Technology Corp.|Diva Server 4PRI"
+0x1133	0xe024	"unknown"	"Eicon Networks Corp.|Diva Server Analog-4P"
+0x1133	0xe028	"unknown"	"Eicon Networks Corp.|Diva Server Analog-8P"
 0x1134	0x0001	"unknown"	"Mercury Computer Systems|Raceway Bridge"
 0x1134	0x153b	"bttv"	"Terratec|TValue"
 0x1135	0x0001	"unknown"	"Fuji Xerox Co Ltd|Printer controller"
 0x1135	0x153b	"bttv"	"Terratec|TValue Radio"
-0x1138	0x5550	"cpcihp_zt5550"	"Ziatech Corporation|"
-0x1138	0x8905	"unknown"	"Ziatech Corporation|8905 [STD 32 Bridge]"
+0x1138	0x5550	"cpcihp_zt5550"	"Ziatech Corp.|"
+0x1138	0x8905	"unknown"	"Ziatech Corp.|8905 [STD 32 Bridge]"
 0x1139	0x0001	"unknown"	"Dynamic Pictures Inc|VGA Compatable 3D Graphics"
 0x113c	0x0000	"unknown"	"Cyclone Microsystems, Inc.|PCI-9060 i960 Bridge"
 0x113c	0x0001	"unknown"	"Cyclone Microsystems, Inc.|PCI-SDK [PCI i960 Evaluation Platform]"
@@ -2817,16 +3151,16 @@
 0x1142	0x6426	"unknown"	"Alliance Semiconductor|GUI Accelerator"
 0x1142	0x643d	"Card:AT3D"	"Alliance Semiconductor|ProMotion AT3D"
 0x1144	0x0001	"unknown"	"Cincinnati Milacron|Noservo controller"
-0x1145	0x8007	"nsp32"	"Workbit Corporation|NinjaSCSI-32 Workbit"
-0x1145	0x8009	"nsp32"	"Workbit Corporation|"
-0x1145	0xf007	"nsp32"	"Workbit Corporation|NinjaSCSI-32 KME"
-0x1145	0xf010	"nsp32"	"Workbit Corporation|NinjaSCSI-32 Workbit"
-0x1145	0xf012	"nsp32"	"Workbit Corporation|NinjaSCSI-32 Logitec"
-0x1145	0xf013	"nsp32"	"Workbit Corporation|NinjaSCSI-32 Logitec"
-0x1145	0xf015	"nsp32"	"Workbit Corporation|NinjaSCSI-32 Melco"
+0x1145	0x8007	"nsp32"	"Workbit Corp.|NinjaSCSI-32 Workbit"
+0x1145	0x8009	"nsp32"	"Workbit Corp.|"
+0x1145	0xf007	"nsp32"	"Workbit Corp.|NinjaSCSI-32 KME"
+0x1145	0xf010	"nsp32"	"Workbit Corp.|NinjaSCSI-32 Workbit"
+0x1145	0xf012	"nsp32"	"Workbit Corp.|NinjaSCSI-32 Logitec"
+0x1145	0xf013	"nsp32"	"Workbit Corp.|NinjaSCSI-32 Logitec"
+0x1145	0xf015	"nsp32"	"Workbit Corp.|NinjaSCSI-32 Melco"
 0x1145	0xf020	"unknown"	"Workbit Corp|CardBus ATAPI Host Adapter"
 0x1148	0x4000	"skfp"	"Syskonnect (Schneider & Koch)|FDDI Adapter"
-0x1148	0x4200	"sktr"	"Syskonnect (Schneider & Koch)|Token ring adaptor"
+0x1148	0x4200	"tmspci"	"Syskonnect (Schneider & Koch)|Token ring adaptor"
 0x1148	0x4300	"sk98lin"	"Syskonnect (Schneider & Koch)|Gigabit Ethernet"
 0x1148	0x4320	"sk98lin"	"Syskonnect (Schneider & Koch)|SK-98xx Gigabit Ethernet Server Adapter"
 0x1148	0x4400	"tg3"	"Syskonnect (Schneider & Koch)|Tigon3 Gigabit Ethernet"
@@ -2912,7 +3246,8 @@
 0x1161	0x0001	"unknown"	"PFU Ltd|Host Bridge"
 0x1163	0x0001	"Card:Rendition Verite 1000"	"Rendition|Verite 1000"
 0x1163	0x2000	"Card:Rendition Verite 2x00"	"Rendition|Verite V2000/V2100/V2200"
-0x1165	0x0001	"unknown"	"Imagraph Corporation|Motion TPEG Recorder/Player with audio"
+0x1165	0x0001	"unknown"	"Imagraph Corp.|Motion TPEG Recorder/Player with audio"
+0x1166	0x0000	"unknown"	"ServerWorks|CMIC-LE"
 0x1166	0x0005	"unknown"	"Reliance Computer|NB6536 (CNB20HE) PCI to PCI Bridge"
 0x1166	0x0006	"unknown"	"Reliance Computer|NB6536 (CNB20HE) Host Bridge"
 0x1166	0x0007	"sworks-agp"	"Reliance Computer|CNB20-LE CPU to PCI Bridge"
@@ -2928,9 +3263,9 @@
 0x1166	0x0017	"unknown"	"ServerWorks|GCNB-LE Host Bridge"
 0x1166	0x0101	"unknown"	"Reliance Computer Corp./ServerWorks|CIOB-X2"
 0x1166	0x0110	"unknown"	"Reliance Computer Corp./ServerWorks| "
-0x1166	0x0200	"unknown"	"ServerWorks|OSB4"
+0x1166	0x0200	"i2c-piix4"	"ServerWorks|OSB4"
 0x1166	0x0201	"scb2_flash"	"ServerWorks|CSB5"
-0x1166	0x0203	"unknown"	"ServerWorks|CSB6 South Bridge"
+0x1166	0x0203	"i2c-piix4"	"ServerWorks|CSB6 South Bridge"
 0x1166	0x0211	"unknown"	"ServerWorks|OSB4 IDE Controller"
 0x1166	0x0212	"unknown"	"Reliance Computer|CSB5 IDE interface"
 0x1166	0x0213	"unknown"	"ServerWorks|CSB6 RAID/IDE Controller"
@@ -2941,12 +3276,14 @@
 0x1166	0x0227	"unknown"	"ServerWorks|GCLE-2 Host Bridge"
 0x1166	0x0230	"unknown"	"Reliance Computer|OSB4 ISA bridge"
 0x1166	0x0240	"sata_svw"	"Reliance Computer|K2 SATA controller"
+0x1166	0x0241	"sata_svw"	""
+0x1166	0x0242	"sata_svw"	""
 0x1169	0x2001	"unknown"	"Centre f/Dev. of Adv. Computing|Ql5032-33APQ208C PCI to C-DAC RTU bus interface FPGA"
 0x116a	0x6100	"unknown"	"Polaris Communications|Bus/Tag Channel"
 0x116a	0x6800	"unknown"	"Polaris Communications|Escon Channel"
 0x116a	0x7100	"unknown"	"Polaris Communications|Bus/Tag Channel"
 0x116a	0x7800	"unknown"	"Polaris Communications|Escon Channel"
-0x1172	0x0001	"unknown"	"Altera Corporation| "
+0x1172	0x0001	"unknown"	"Altera Corp.| "
 0x1176	0x0104	"wanxl"	"SBE Inc|WanXL100 Adapter"
 0x1176	0x0301	"wanxl"	"SBE Inc|WanXL200 Adapter"
 0x1176	0x0302	"wanxl"	"SBE Inc|WanXL400 Adapter"
@@ -2969,10 +3306,10 @@
 0x1179	0x0611	"unknown"	"Toshiba America Info Systems|PCI to ISA Bridge"
 0x1179	0x0617	"yenta_socket"	"Toshiba|ToPIC95 PCI to Cardbus Bridge with ZV Support"
 0x1179	0x0618	"unknown"	"Toshiba|CPU to PCI and PCI to ISA bridge"
-0x1179	0x0701	"toshoboe"	"Toshiba|FIR Port"
+0x1179	0x0701	"donauboe"	"Toshiba|FIR Port"
 0x1179	0x0804	"unknown"	"Toshiba|TC6371AF SmartMedia Controller"
 0x1179	0x0805	"unknown"	"Toshiba America Info Systems|SD TypA Controller"
-0x1179	0x0d01	"toshoboe"	"Toshiba|FIR Port Type-DO"
+0x1179	0x0d01	"donauboe"	"Toshiba|FIR Port Type-DO"
 0x1179	0x13a8	"unknown"	"Toshiba America Info Systems|XR17C158/154/152 Multi-channel PCI UART"
 0x117e	0x0001	"unknown"	"T/R Systems|Printer Host"
 0x1180	0x0465	"yenta_socket"	"Ricoh Co Ltd|RL5c465"
@@ -2981,21 +3318,38 @@
 0x1180	0x0476	"yenta_socket"	"Ricoh Co Ltd|RL5c476 II"
 0x1180	0x0477	"yenta_socket"	"Ricoh Co Ltd|RL5c477"
 0x1180	0x0478	"yenta_socket"	"Ricoh Co Ltd|RL5c478"
-0x1180	0x0521	"unknown"	"Communication Automation Corporation|R5C521 1394 Host Controller"
+0x1180	0x0521	"unknown"	"Communication Automation Corp.|R5C521 1394 Host Controller"
 0x1180	0x0522	"unknown"	"Ricoh Co Ltd|R5C522 IEEE 1394 Controller"
 0x1180	0x0551	"unknown"	"Ricoh Co Ltd|R5C551 IEEE 1394 Controller"
 0x1180	0x0552	"unknown"	"Ricoh Co Ltd|R5C552 IEEE 1394 Controller"
-0x1180	0x0576	"unknown"	"Communication Automation Corporation|SD-Card Interface"
+0x1180	0x0576	"unknown"	"Communication Automation Corp.|SD-Card Interface"
 0x1185	0x8929	"unknown"	"Dataworld|EIDE"
 0x1186	0x0100	"tulip"	"D-Link System Inc|DC21041"
 0x1186	0x1002	"sundance"	"D-Link Inc|DFE 550 TX"
+0x1186	0x1025	"unknown"	"D-Link System Inc|AirPlus Xtreme G DWL-G650 Adapter"
+0x1186	0x1026	"unknown"	"D-Link System Inc|AirXpert DWL-AG650 Wireless Cardbus Adapter"
+0x1186	0x1043	"unknown"	"D-Link System Inc|AirXpert DWL-AG650 Wireless Cardbus Adapter"
 0x1186	0x1100	"tulip"	"D-Link Inc|Fast Ethernet Adapter"
 0x1186	0x1300	"8139too"	"D-Link Inc|DFE 530 TX+ Fast Ethernet Adapter"
 0x1186	0x1340	"8139too"	"D-Link Inc|DFE-690TXD (CardBus PC Card)"
+0x1186	0x1541	"tulip"	"D-Link System Inc|DFE-680TXD CardBus PC Card"
 0x1186	0x1561	"tulip"	"D-Link System Inc|DRP-32TXD Cardbus PC Card"
+0x1186	0x2027	"unknown"	"D-Link System Inc|AirPlus Xtreme G DWL-G520 Adapter"
 0x1186	0x3065	"unknown"	"D-Link System Inc| "
 0x1186	0x3106	"unknown"	"D-Link System Inc| "
+0x1186	0x3203	"unknown"	"D-Link System Inc|AirPlus Xtreme G DWL-G520 Adapter"
 0x1186	0x3300	"unknown"	"D-Link System Inc|D-Link Air Wireless Network (DWL-510) IEEE 802.11b PCI card"
+0x1186	0x3a03	"unknown"	"D-Link System Inc|AirPro DWL-A650 Wireless Cardbus Adapter(rev.B)"
+0x1186	0x3a04	"unknown"	"D-Link System Inc|AirPro DWL-AB650 Multimode Wireless Cardbus Adapter"
+0x1186	0x3a05	"unknown"	"D-Link System Inc|AirPro DWL-AB520 Multimode Wireless PCI Adapter"
+0x1186	0x3a07	"unknown"	"D-Link System Inc|AirXpert DWL-AG650 Wireless Cardbus Adapter"
+0x1186	0x3a08	"unknown"	"D-Link System Inc|AirXpert DWL-AG520 Wireless PCI Adapter"
+0x1186	0x3a10	"unknown"	"D-Link System Inc|AirXpert DWL-AG650 Wireless Cardbus Adapter(rev.B)"
+0x1186	0x3a11	"unknown"	"D-Link System Inc|AirXpert DWL-AG520 Wireless PCI Adapter(rev.B)"
+0x1186	0x3a12	"unknown"	"D-Link System Inc|AirPlus DWL-G650 Wireless Cardbus Adapter(rev.C)"
+0x1186	0x3a13	"unknown"	"D-Link System Inc|AirPlus DWL-G520 Wireless PCI Adapter(rev.B)"
+0x1186	0x3a14	"unknown"	"D-Link System Inc|AirPremier DWL-AG530 Wireless PCI Adapter"
+0x1186	0x3a63	"unknown"	"D-Link System Inc|AirXpert DWL-AG660 Wireless Cardbus Adapter"
 0x1186	0x3b05	"unknown"	"D-Link System Inc|DWL-G650+ CardBus PC Card"
 0x1186	0x4000	"dl2k"	"D-Link Inc| Ethernet Adapter"
 0x1186	0x4001	"unknown"	"D-Link System Inc|DFE-650TX D Link Fast Ethernet PCMCIA Card"
@@ -3035,11 +3389,11 @@
 0x1191	0x0002	"unknown"	"Acard Technology Corp|EIDE Adapter"
 0x1191	0x0003	"unknown"	"Acard Technology Corp|SCSI Cache Host Adapter"
 0x1191	0x0004	"unknown"	"Artop Electronic Corp|ATP8400"
-0x1191	0x0005	"unknown"	"Artop Electronic Corp|ATP850UF"
-0x1191	0x0006	"unknown"	"Artop Electronic Corp|ATP860 NO-BIOS"
-0x1191	0x0007	"unknown"	"Artop Electronic Corp|ATP860"
-0x1191	0x0008	"unknown"	"Artop Electronic Corp|ATP865 NO-ROM"
-0x1191	0x0009	"unknown"	"Artop Electronic Corp|ATP865"
+0x1191	0x0005	"aec62xx"	"Artop Electronic Corp|ATP850UF"
+0x1191	0x0006	"aec62xx"	"Artop Electronic Corp|ATP860 NO-BIOS"
+0x1191	0x0007	"aec62xx"	"Artop Electronic Corp|ATP860"
+0x1191	0x0008	"aec62xx"	"Artop Electronic Corp|ATP865 NO-ROM"
+0x1191	0x0009	"aec62xx"	"Artop Electronic Corp|ATP865"
 0x1191	0x8001	"unknown"	"Acard Technology Corp|SCSI-2 Cache Host Adapter"
 0x1191	0x8002	"atp870u"	"Artop Electronic Corp|AEC6710 SCSI-2 Host Adapter"
 0x1191	0x8010	"atp870u"	"Artop Electronic Corp|AEC6712UW SCSI"
@@ -3064,7 +3418,9 @@
 0x11a8	0x7408	"unknown"	"Systech Corp.|NTX-8023-PCI 8MB Short Card"
 0x11a9	0x4240	"unknown"	"InnoSys Inc.|AMCC S933Q Intelligent Serial Card"
 0x11ab	0x0146	"unknown"	"Galileo Technology Ltd.|GT-64010"
+0x11ab	0x1fa6	"unknown"	"Marvell Technology Group Ltd.|Marvell W8300 802.11 Adapter"
 0x11ab	0x4320	"sk98lin"	"Marvell Semiconductor, Inc.|88E8001 Gigabit Lan PCI Controller"
+0x11ab	0x4362	"unknown"	"Marvell Technology Group Ltd.|Marvell Yukon 88E8053 Gigabit Ethernet 10/100/1000Base-T Adapter"
 0x11ab	0x4611	"unknown"	"Galileo Technology Ltd.|GT-64115 System Controller"
 0x11ab	0x4620	"unknown"	"Galileo Technology Ltd|GT-64120 System Controller for R5K &amp; R7K w/64bit PCI"
 0x11ab	0x4801	"unknown"	"Galileo Technology Ltd.|GT-48001"
@@ -3084,10 +3440,21 @@
 0x11ad	0x0001	"unknown"	"Lite-On Communications Inc| "
 0x11ad	0x0002	"tulip"	"Lite-On|LNE100TX"
 0x11ad	0xc115	"tulip"	"Lite-On|LC82C115 PNIC-II"
-0x11ae	0x4153	"unknown"	"Scitex Corporation Ltd|Bridge Controller"
-0x11ae	0x5842	"unknown"	"Scitex Corporation Ltd|Bridge Controller"
+0x11ae	0x4153	"unknown"	"Scitex Corp. Ltd|Bridge Controller"
+0x11ae	0x5842	"unknown"	"Scitex Corp. Ltd|Bridge Controller"
 0x11af	0x0001	"unknown"	"Avid Technology Inc.|[Cinema]"
-0x11b0	0x0001	"unknown"	"V3 Semiconductor Inc.|V960PBC i960 Local Bus PCI Bridge"
+0x11b0	0x0001	"8250_pci"	"V3 Semiconductor Inc.|V960PBC i960 Local Bus PCI Bridge"
+0x11b0	0x0002	0x12c4	0x0001	"8250_pci"	""
+0x11b0	0x0002	0x12c4	0x0002	"8250_pci"	""
+0x11b0	0x0002	0x12c4	0x0003	"8250_pci"	""
+0x11b0	0x0002	0x12c4	0x0004	"8250_pci"	""
+0x11b0	0x0002	0x12c4	0x0005	"8250_pci"	""
+0x11b0	0x0002	0x12c4	0x0006	"8250_pci"	""
+0x11b0	0x0002	0x12c4	0x0007	"8250_pci"	""
+0x11b0	0x0002	0x12c4	0x0008	"8250_pci"	""
+0x11b0	0x0002	0x12c4	0x0009	"8250_pci"	""
+0x11b0	0x0002	0x12c4	0x000a	"8250_pci"	""
+0x11b0	0x0002	0x12c4	0x000b	"8250_pci"	""
 0x11b0	0x0002	"sdladrv"	"V3 Semiconductor Inc.|V300PSC"
 0x11b0	0x0004	"unknown"	"V3 Semiconductor Inc.|V962PBC i960 Local Bus PCI Bridge"
 0x11b0	0x0010	"unknown"	"V3 Semiconductor Inc.|V292PBC Am29K Local Bus PCI Bridge"
@@ -3142,7 +3509,7 @@
 0x11c1	0x0461	"Bad:www.linmodems.org"	"Agere Systems|V90 Wildfire Modem"
 0x11c1	0x0462	"Bad:www.linmodems.org"	"Agere Systems|56K.V90/ADSL Wildfire Modem"
 0x11c1	0x0464	"unknown"	"Agere Systems|Riptide Audio PCI Legacy Resources"
-0x11c1	0x0480	"unknown"	"Lucent Microelectronics|Venus WinModem (V90, 56KFlex)"
+0x11c1	0x0480	"8250_pci"	"Lucent Microelectronics|Venus WinModem (V90, 56KFlex)"
 0x11c1	0x048c	"unknown"	"Agere Systems|SV92P SV92P PCI Soft Modem Chip Set"
 0x11c1	0x048f	"unknown"	"Agere Systems|SV92P-T00"
 0x11c1	0x0540	"unknown"	"Agere Systems| "
@@ -3152,7 +3519,10 @@
 0x11c1	0x5805	"unknown"	"Agere Systems|USB Advanced Host Controller"
 0x11c1	0x5811	"ohci1394"	"Lucent Microelectronics|FW323 FireWire (IEEE 1394)"
 0x11c1	0x7121	"unknown"	"Agere Systems| "
+0x11c1	0xab10	"unknown"	"Agere Systems (former Lucent Microelectronics)|WL60010 Wireless LAN MAC"
+0x11c1	0xab11	"unknown"	"Agere Systems (former Lucent Microelectronics)|WL60040 Multimode Wireles LAN MAC"
 0x11c1	0xab20	"unknown"	"Agere Systems|WaveLAN PCI Wireless LAN Adapter"
+0x11c1	0xab21	"unknown"	"Agere Systems (former Lucent Microelectronics)|Agere Wireless PCI Adapter"
 0x11c6	0x3001	"unknown"	"Dainippon Screen Mfg. Co|1 VM-1200 Opto Unit Controller"
 0x11c8	0x0658	"unknown"	"Dolphin|PSB32 SCI-Adapter D31x"
 0x11c8	0xd665	"unknown"	"Dolphin|PSB64 SCI-Adapter D32x"
@@ -3162,7 +3532,8 @@
 0x11cb	0x2000	"sx"	"Specialix Research Ltd.|PCI_9050"
 0x11cb	0x4000	"unknown"	"Specialix Research Ltd.|SUPI_1"
 0x11cb	0x8000	"unknown"	"Specialix Research Ltd.|T225"
-0x11d1	0x0000	"unknown"	"AuraVision Corporation| "
+0x11cb	0x9501	"8250_pci"	""
+0x11d1	0x0000	"unknown"	"AuraVision Corp.| "
 0x11d1	0x01f7	"unknown"	"Auravision|VxP524"
 0x11d4	0x1535	"unknown"	"Analog Devices, Inc.|ADSP-21535 Blackfin DSP PCI Bus Interface"
 0x11d4	0x1805	"unknown"	"Analog Devices|<DELETE> erl3227a-0.8"
@@ -3171,15 +3542,15 @@
 0x11d4	0x219a	"unknown"	"Analog Devices|ADSP-2192 DSP Microcomputer (function #1)"
 0x11d4	0x219e	"unknown"	"Analog Devices|ADSP-2192 DSP Microcomputer (function #2)"
 0x11d4	0x2f44	"unknown"	"Analog Devices|ADSP-2141 SafeNet Crypto Accelerator chip"
-0x11d5	0x0115	"unknown"	"Ikon Corporation|10115"
+0x11d5	0x0115	"unknown"	"Ikon Corp.|10115"
 0x11d5	0x0116	"unknown"	"Tahoma Technology|10116 DR11-W emulator"
-0x11d5	0x0117	"unknown"	"Ikon Corporation|10117"
+0x11d5	0x0117	"unknown"	"Ikon Corp.|10117"
 0x11d5	0x0118	"unknown"	"Tahoma Technology|10118 DR11-W emulator"
 0x11db	0x1234	"8139too"	"Sega Enterprises Ltd|Dreamcast Broadband Adapter"
-0x11de	0x6057	"zr36067"	"Zoran Corporation|ZR36057PQC Video cutting chipset"
-0x11de	0x6120	"ISDN:hisax"	"Zoran Corporation|ZR36120 ISDN Adapter"
-0x11de	0x9876	"unknown"	"Zoran Corporation| "
-0x11e3	0x5030	"pcwd"	"Quicklogic Corporation|PC Watchdog"
+0x11de	0x6057	"zr36067"	"Zoran Corp.|ZR36057PQC Video cutting chipset"
+0x11de	0x6120	"ISDN:hisax"	"Zoran Corp.|ZR36120 ISDN Adapter"
+0x11de	0x9876	"unknown"	"Zoran Corp.| "
+0x11e3	0x5030	"pcwd_pci"	"Quicklogic Corp.|PC Watchdog"
 0x11ec	0x2064	"unknown"	"Coreco Inc| "
 0x11f0	0x4231	"unknown"	"Compu-Shack|FDDI"
 0x11f0	0x4232	"unknown"	"Compu-Shack|FASTline UTP Quattro"
@@ -3202,50 +3573,51 @@
 0x11f8	0x7380	"unknown"	"PMC-Sierra Inc.|PM7380 FREEDM-32P672 Frm Engine & Datalink Mgr"
 0x11f8	0x7382	"unknown"	"PMC-Sierra Inc.|PM7382 FREEDM-32P256 Frm Engine & Datalink Mgr"
 0x11f8	0x7384	"unknown"	"PMC-Sierra Inc.|PM7384 FREEDM-84P672 Frm Engine & Datalink Mgr"
-0x11fe	0x0001	"unknown"	"Comtrol Corporation|RocketPort 8 Oct"
-0x11fe	0x0002	"unknown"	"Comtrol Corporation|RocketPort 8 Intf"
-0x11fe	0x0003	"unknown"	"Comtrol Corporation|RocketPort 16 Intf"
-0x11fe	0x0004	"unknown"	"Comtrol Corporation|RocketPort 32 Intf"
-0x11fe	0x0005	"unknown"	"Comtrol Corporation|RocketPort Octacable"
-0x11fe	0x0006	"unknown"	"Comtrol Corporation|RocketPort 8J"
-0x11fe	0x0007	"unknown"	"Comtrol Corporation|RocketPort 4-port"
-0x11fe	0x0008	"unknown"	"Comtrol Corporation|RocketPort 8-port"
-0x11fe	0x0009	"unknown"	"Comtrol Corporation|RocketPort 16-port"
-0x11fe	0x000a	"unknown"	"Comtrol Corporation|RocketPort Plus Quadcable"
-0x11fe	0x000b	"unknown"	"Comtrol Corporation|RocketPort Plus Octacable"
-0x11fe	0x000c	"unknown"	"Comtrol Corporation|RocketPort 8-port Modem"
+0x11fe	0x0001	"unknown"	"Comtrol Corp.|RocketPort 8 Oct"
+0x11fe	0x0002	"unknown"	"Comtrol Corp.|RocketPort 8 Intf"
+0x11fe	0x0003	"unknown"	"Comtrol Corp.|RocketPort 16 Intf"
+0x11fe	0x0004	"unknown"	"Comtrol Corp.|RocketPort 32 Intf"
+0x11fe	0x0005	"unknown"	"Comtrol Corp.|RocketPort Octacable"
+0x11fe	0x0006	"unknown"	"Comtrol Corp.|RocketPort 8J"
+0x11fe	0x0007	"unknown"	"Comtrol Corp.|RocketPort 4-port"
+0x11fe	0x0008	"unknown"	"Comtrol Corp.|RocketPort 8-port"
+0x11fe	0x0009	"unknown"	"Comtrol Corp.|RocketPort 16-port"
+0x11fe	0x000a	"unknown"	"Comtrol Corp.|RocketPort Plus Quadcable"
+0x11fe	0x000b	"unknown"	"Comtrol Corp.|RocketPort Plus Octacable"
+0x11fe	0x000c	"unknown"	"Comtrol Corp.|RocketPort 8-port Modem"
 0x11fe	0x000d	"unknown"	"Comtrol Corp|RocketPort"
-0x11fe	0x000e	"unknown"	"Comtrol Corporation|RocketPort Plus 2 port RS232"
-0x11fe	0x000f	"unknown"	"Comtrol Corporation|RocketPort Plus 2 port RS422"
-0x11fe	0x0801	"unknown"	"Comtrol Corporation|RocketPort UPCI 32 port w/external I/F"
-0x11fe	0x0802	"unknown"	"Comtrol Corporation|RocketPort UPCI 8 port w/external I/F"
-0x11fe	0x0803	"unknown"	"Comtrol Corporation|RocketPort UPCI 16 port w/external I/F"
-0x11fe	0x0805	"unknown"	"Comtrol Corporation|RocketPort UPCI 8 port w/octa cable"
-0x11fe	0x080c	"unknown"	"Comtrol Corporation|RocketModem III 8 port"
-0x11fe	0x080d	"unknown"	"Comtrol Corporation|RocketModem III 4 port"
-0x11fe	0x0903	"unknown"	"Comtrol Corporation|RocketPort Compact PCI 16 port w/external I/F"
-0x11fe	0x8015	"unknown"	"Comtrol Corporation|RocketPort 4-port UART 16954"
+0x11fe	0x000e	"unknown"	"Comtrol Corp.|RocketPort Plus 2 port RS232"
+0x11fe	0x000f	"unknown"	"Comtrol Corp.|RocketPort Plus 2 port RS422"
+0x11fe	0x0801	"unknown"	"Comtrol Corp.|RocketPort UPCI 32 port w/external I/F"
+0x11fe	0x0802	"unknown"	"Comtrol Corp.|RocketPort UPCI 8 port w/external I/F"
+0x11fe	0x0803	"unknown"	"Comtrol Corp.|RocketPort UPCI 16 port w/external I/F"
+0x11fe	0x0805	"unknown"	"Comtrol Corp.|RocketPort UPCI 8 port w/octa cable"
+0x11fe	0x080c	"unknown"	"Comtrol Corp.|RocketModem III 8 port"
+0x11fe	0x080d	"unknown"	"Comtrol Corp.|RocketModem III 4 port"
+0x11fe	0x0903	"unknown"	"Comtrol Corp.|RocketPort Compact PCI 16 port w/external I/F"
+0x11fe	0x8015	"unknown"	"Comtrol Corp.|RocketPort 4-port UART 16954"
+0x11ff	0x0003	"unknown"	"Scion Corporation|AG-5"
 0x1200	0xbd11	"bttv"	"Pinnacle|PCTV Rave"
 0x1202	0x0001	"unknown"	"Network General Corp|NAIATMPCI PCI ATM Adapter"
 0x1202	0x4300	"unknown"	"Network General Corp.|Gigabit Ethernet Adapter"
 0x1208	0x4853	"unknown"	"Parsytec GmbH|HS-Link Device"
-0x120e	0x0100	"unknown"	"Cyclades Corporation|Cyclom_Y below first megabyte"
-0x120e	0x0101	"unknown"	"Cyclades Corporation|Cyclom_Y above first megabyte"
-0x120e	0x0102	"unknown"	"Cyclades Corporation|Cyclom_4Y below first megabyte"
-0x120e	0x0103	"unknown"	"Cyclades Corporation|Cyclom_4Y above first megabyte"
-0x120e	0x0104	"unknown"	"Cyclades Corporation|Cyclom_8Y below first megabyte"
-0x120e	0x0105	"unknown"	"Cyclades Corporation|Cyclom_8Y above first megabyte"
-0x120e	0x0200	"unknown"	"Cyclades Corporation|Cyclom_Z below first megabyte"
-0x120e	0x0201	"unknown"	"Cyclades Corporation|Cyclom_Z above first megabyte"
-0x120e	0x0300	"pc300too"	"Cyclades Corporation|PC300 RX 2"
-0x120e	0x0301	"pc300too"	"Cyclades Corporation|PC300 RX 1"
-0x120e	0x0302	"unknown"	"Cyclades Corporation|PC300 TE 2"
-0x120e	0x0303	"unknown"	"Cyclades Corporation|PC300 TE 1"
-0x120e	0x0310	"pc300too"	"Cyclades Corporation|PC300 TE 2"
-0x120e	0x0311	"pc300too"	"Cyclades Corporation|PC300 TE 1"
-0x120e	0x0320	"pc300"	"Cyclades Corporation|PC300/TE-M (2 ports)"
-0x120e	0x0321	"pc300"	"Cyclades Corporation|PC300/TE-M (1 port)"
-0x120e	0x0400	"unknown"	"Cyclades Corporation|PC400"
+0x120e	0x0100	"unknown"	"Cyclades Corp.|Cyclom_Y below first megabyte"
+0x120e	0x0101	"unknown"	"Cyclades Corp.|Cyclom_Y above first megabyte"
+0x120e	0x0102	"unknown"	"Cyclades Corp.|Cyclom_4Y below first megabyte"
+0x120e	0x0103	"unknown"	"Cyclades Corp.|Cyclom_4Y above first megabyte"
+0x120e	0x0104	"unknown"	"Cyclades Corp.|Cyclom_8Y below first megabyte"
+0x120e	0x0105	"unknown"	"Cyclades Corp.|Cyclom_8Y above first megabyte"
+0x120e	0x0200	"unknown"	"Cyclades Corp.|Cyclom_Z below first megabyte"
+0x120e	0x0201	"unknown"	"Cyclades Corp.|Cyclom_Z above first megabyte"
+0x120e	0x0300	"pc300"	"Cyclades Corp.|PC300 RX 2"
+0x120e	0x0301	"pc300"	"Cyclades Corp.|PC300 RX 1"
+0x120e	0x0302	"unknown"	"Cyclades Corp.|PC300 TE 2"
+0x120e	0x0303	"unknown"	"Cyclades Corp.|PC300 TE 1"
+0x120e	0x0310	"pc300"	"Cyclades Corp.|PC300 TE 2"
+0x120e	0x0311	"pc300"	"Cyclades Corp.|PC300 TE 1"
+0x120e	0x0320	"pc300"	"Cyclades Corp.|PC300/TE-M (2 ports)"
+0x120e	0x0321	"pc300"	"Cyclades Corp.|PC300/TE-M (1 port)"
+0x120e	0x0400	"unknown"	"Cyclades Corp.|PC400"
 0x120f	0x0001	"rrunner"	"Essential Communications|Roadrunner serial HIPPI"
 0x1217	0x6729	"yenta_socket"	"O2 Micro, Inc.|6729"
 0x1217	0x673a	"yenta_socket"	"O2 Micro, Inc.|6730"
@@ -3255,14 +3627,14 @@
 0x1217	0x6925	"yenta_socket"	"O2Micro Inc|OZ6922 CardBus Controller"
 0x1217	0x6933	"yenta_socket"	"O2 Micro, Inc.|OZ6933 Cardbus Controller"
 0x1217	0x6972	"yenta_socket"	"O2Micro Inc|OZ6912 CardBus Controller"
-0x1217	0x7110	"unknown"	"O2 Micro, Inc.|OZ711Mx MultiMediaBay Accelerator"
-0x1217	0x7112	"unknown"	"O2Micro Inc| "
-0x1217	0x7113	"unknown"	"O2Micro Inc| "
-0x1217	0x7114	"unknown"	"O2Micro Inc| "
-0x1217	0x71e2	"unknown"	"O2Micro Inc| "
-0x1217	0x7212	"unknown"	"O2Micro Inc| "
-0x1217	0x7213	"unknown"	"O2Micro Inc| "
-0x1217	0x7223	"unknown"	"O2Micro Inc| "
+0x1217	0x7110	"yenta_socket"	"O2 Micro, Inc.|OZ711Mx MultiMediaBay Accelerator"
+0x1217	0x7112	"yenta_socket"	"O2Micro Inc|OZ711EC1/M1 SmartCardBus MultiMediaBay Controller"
+0x1217	0x7113	"yenta_socket"	"O2Micro Inc|OZ711EC1 SmartCardBus Controller"
+0x1217	0x7114	"yenta_socket"	"O2Micro Inc|OZ711M1 SmartCardBus MultiMediaBay Controller"
+0x1217	0x71e2	"yenta_socket"	"O2Micro Inc|OZ711E2 SmartCardBus Controller"
+0x1217	0x7212	"yenta_socket"	"O2Micro Inc|OZ711M2 SmartCardBus MultiMediaBay Controller"
+0x1217	0x7213	"yenta_socket"	"O2Micro Inc|OZ6933E CardBus Controller"
+0x1217	0x7223	"yenta_socket"	"O2Micro Inc|OZ711M3 SmartCardBus MultiMediaBay Controller"
 0x121a	0x0001	"unknown"	"3Dfx Interactive, Inc.|Voodoo"
 0x121a	0x0002	"unknown"	"3Dfx Interactive, Inc.|Voodoo 2"
 0x121a	0x0003	"Card:Voodoo Banshee (generic)"	"3Dfx Interactive, Inc.|Voodoo Banshee"
@@ -3272,7 +3644,7 @@
 0x121a	0x0009	"Card:Voodoo5 (generic)"	"3Dfx Interactive, Inc.|Voodoo 4 / Voodoo 5"
 0x121a	0x0010	"unknown"	"3dfx Interactive Inc|Rampage Rev.A AGPx4, 0.25µm, 200/2x200 core/RAM"
 0x121a	0x0057	"unknown"	"3Dfx Interactive, Inc.|Voodoo 3/3000 [Avenger]"
-0x1220	0x1220	"unknown"	"Ariel Corporation|AMCC 5933 TMS320C80 DSP/Imaging board"
+0x1220	0x1220	"unknown"	"Ariel Corp.|AMCC 5933 TMS320C80 DSP/Imaging board"
 0x1223	0x0003	"unknown"	"Artesyn Communication Products|PM/Link"
 0x1223	0x0004	"unknown"	"Artesyn Communication Products|PM/T1"
 0x1223	0x0005	"unknown"	"Artesyn Communication Products|PM/E1"
@@ -3285,11 +3657,12 @@
 0x1223	0x000e	"unknown"	"Artesyn Communication Products|PM/PPC"
 0x1227	0x0006	"unknown"	"Tech-Source|Raptor GFX 8P"
 0x122d	0x1206	"unknown"	"Aztech System Ltd|368DSP"
+0x122d	0x1400	"unknown"	"Aztech System Ltd|Trident PCI288-Q3DII (NX)"
 0x122d	0x4201	"unknown"	"Aztech System Ltd|MR2800W AMR 56K modem"
 0x122d	0x50dc	"snd-azt3328"	"Aztech System Ltd|3328 Audio"
 0x122d	0x80da	"snd-azt3328"	"Aztech System Ltd|3328 Audio (AZF3328, PCI168)"
-0x1236	0x0000	"unknown"	"Sigma Designs Corporation|RealMagic64/GX"
-0x1236	0x6401	"unknown"	"Sigma Designs Corporation|REALmagic 64/GX (SD 6425)"
+0x1236	0x0000	"unknown"	"Sigma Designs Corp.|RealMagic64/GX"
+0x1236	0x6401	"unknown"	"Sigma Designs Corp.|REALmagic 64/GX (SD 6425)"
 0x123d	0x0000	"unknown"	"Engineering Design Team, Inc.|EasyConnect 8/32"
 0x123d	0x0002	"unknown"	"Engineering Design Team, Inc.|EasyConnect 8/64"
 0x123d	0x0003	"unknown"	"Engineering Design Team, Inc.|EasyIO"
@@ -3298,19 +3671,21 @@
 0x123f	0x6120	"unknown"	"C-Cube Microsystems|DVD device"
 0x123f	0x8120	"unknown"	"C-Cube Microsystems|E4?"
 0x123f	0x8888	"unknown"	"C-Cube Microsystems|Cinemaster C 3.0 DVD Decoder"
-0x1242	0x1460	"unknown"	"JNI Corporation|JNIC-1460 2-Gb/s Fibre Channel-PCI 64-bit 66 MHz"
-0x1242	0x1560	"unknown"	"JNI Corporation|JNIC-1560 Dual Channel 2 Gb/s Fibre Channel-PCI-X"
+0x1242	0x1460	"unknown"	"JNI Corp.|JNIC-1460 2-Gb/s Fibre Channel-PCI 64-bit 66 MHz"
+0x1242	0x1560	"unknown"	"JNI Corp.|JNIC-1560 Dual Channel 2 Gb/s Fibre Channel-PCI-X"
 0x1242	0x4643	"unknown"	"Jaycor Networks, Inc.|FCI-1063 Fibre Channel Adapter"
-0x1242	0x6562	"unknown"	"JNI Corporation|FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter"
-0x1242	0x656a	"unknown"	"JNI Corporation|FCX-6562 PCI-X Fibre Channel Adapter"
+0x1242	0x6562	"unknown"	"JNI Corp.|FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter"
+0x1242	0x656a	"unknown"	"JNI Corp.|FCX-6562 PCI-X Fibre Channel Adapter"
 0x1244	0x0700	"ISDN:b1pci,type=27"	"AVM Audiovisuelles|B1 ISDN Adapter"
 0x1244	0x0800	"ISDN:c4"	"AVM AUDIOVISUELLES MKTG & Computer GmbH|C4 ISDN Controller"
 0x1244	0x0a00	"ISDN:hisax,type=27"	"AVM Audiovisuelles|A1 ISDN Adapter [Fritz]"
 0x1244	0x0e00	"ISDN:hisax_fcpcipnp"	"AVM Audiovisuelles|A1 ISDN Adapter [Fritz]"
-0x1244	0x0f00	"unknown"	"AVM Audiovisuelles|Fritz DSL ISDN/DSL Adapter"
+0x1244	0x0f00	"ISDN:capidrv"	"AVM Audiovisuelles|Fritz DSL ISDN/DSL Adapter"
 0x1244	0x1100	"ISDN:c4"	"AVM AUDIOVISUELLES MKTG & Computer GmbH|C2 ISDN Controller"
 0x1244	0x1200	"t1pci"	"AVM Audiovisuelles|T1 pci adapter"
-0x1244	0x2700	"unknown"	"AVM Audiovisuelles|Fritz!Card DSL SL"
+0x1244	0x2700	"ISDN:fcdslsl,type=,firmware:fdssbase.bin"	"AVM Audiovisuelles|Fritz!Card DSL SL"
+0x1244	0x2900	"ISDN:fcdsl2,type=,firmware:fds2base.bin"	"AVM Audiovisuelles|Fritz!Card DSL SL Ver. 2.0"
+0x124b	0x0001	"8250_pci"	""
 0x124b	0x0040	"unknown"	"SBS/Greenspring Modular I/O|cPCI-200 Four Slot IndustryPack carrier"
 0x124d	0x0000	"unknown"	"Stallion|EasyConnection 8/32"
 0x124d	0x0002	"unknown"	"Stallion|EasyConnection 8/64"
@@ -3352,14 +3727,15 @@
 0x125d	0x2808	"unknown"	"ESS Technology|ES336H Fax Modem (Later Model)"
 0x125d	0x2838	"Bad:www.linmodems.org"	"ESS Technology|ES2838/2839 SuperLink Modem"
 0x125d	0x2898	"unknown"	"ESS Technology|ES2898 Modem"
-0x1260	0x3872	"orinoco_pci"	"Intersil Corporation|"
-0x1260	0x3873	"orinoco_pci"	"Intersil Corporation|ISL3874A PRISMII.5 IEE802.11B Wireless LAN"
-0x1260	0x3877	"prism54"	"Intersil Corporation|Prism Indigo Wavelan chipset"
-0x1260	0x3890	"prism54"	"Intersil Corporation|PRISM GT 802.11g 54Mbps Wireless Controller"
-0x1260	0x8130	"unknown"	"Intersil Corporation|HMP8130 NTSC/PAL Video Decoder"
-0x1260	0x8131	"unknown"	"Intersil Corporation|HMP8131 NTSC/PAL Video Decoder"
-0x1266	0x0001	"eepro100"	"Microdyne Corporation|NE10/100 Adapter (i82557B)"
-0x1266	0x1910	"unknown"	"Microdyne Corporation|NE2000Plus (RT8029) Ethernet Adapter"
+0x1260	0x3872	"orinoco_pci"	"Intersil Corp.|"
+0x1260	0x3873	"orinoco_pci"	"Intersil Corp.|ISL3874A PRISMII.5 IEE802.11B Wireless LAN"
+0x1260	0x3877	"prism54"	"Intersil Corp.|Prism Indigo Wavelan chipset"
+0x1260	0x3886	"prism54"	"Intersil Corp.|ISL3886 [Prism Javelin/Prism Xbow]"
+0x1260	0x3890	"prism54"	"Intersil Corp.|PRISM GT 802.11g 54Mbps Wireless Controller"
+0x1260	0x8130	"unknown"	"Intersil Corp.|HMP8130 NTSC/PAL Video Decoder"
+0x1260	0x8131	"unknown"	"Intersil Corp.|HMP8131 NTSC/PAL Video Decoder"
+0x1266	0x0001	"eepro100"	"Microdyne Corp.|NE10/100 Adapter (i82557B)"
+0x1266	0x1910	"unknown"	"Microdyne Corp.|NE2000Plus (RT8029) Ethernet Adapter"
 0x1267	0x1016	"ISDN:hisax,type=24"	"S. A. Telecommunications|Dr. Neuhaus Niccy PCI ISDN Adapter"
 0x1267	0x4243	"unknown"	"S.A. Telecommunications|Satellite receiver board / MPEG2 decoder"
 0x1267	0x5352	"unknown"	"S. A. Telecommunications|PCR2101"
@@ -3388,12 +3764,14 @@
 0x1274	0x9876	"unknown"	"Ensoniq| "
 0x1278	0x0701	"unknown"	"Transtech Parallel Systems|TPE3/TM3 PowerPC Node"
 0x1278	0x0710	"unknown"	"Transtech Parallel Systems Ltd.|TPE5 PowerPC PCI board"
-0x1279	0x0295	"unknown"	"Transmeta Corporation|Virtual Northbridge"
-0x1279	0x0395	"unknown"	"Transmeta Corporation|LongRun Northbridge"
-0x1279	0x0396	"unknown"	"Transmeta Corporation|SDRAM controller"
-0x1279	0x0397	"unknown"	"Transmeta Corporation|BIOS scratchpad"
+0x1279	0x0295	"unknown"	"Transmeta Corp.|Virtual Northbridge"
+0x1279	0x0395	"unknown"	"Transmeta Corp.|LongRun Northbridge"
+0x1279	0x0396	"unknown"	"Transmeta Corp.|SDRAM controller"
+0x1279	0x0397	"unknown"	"Transmeta Corp.|BIOS scratchpad"
 0x127a	0x1002	"Hcf:www.linmodems.org"	"Rockwell International|HCF 56k V90 FaxModem"
 0x127a	0x1003	"Hcf:www.linmodems.org"	"Rockwell International|HCF 56k V90 FaxModem"
+0x127a	0x1004	0x1048	0x1500	"8250_pci"	"Rockwell International|MicroLink 56k Modem"
+0x127a	0x1004	0x10cf	0x1059	"Hcf:www.linmodems.org"	"Rockwell International|Fujitsu 229-DFRT"
 0x127a	0x1004	"Hcf:www.linmodems.org"	"Rockwell International|HCF 56k V90 FaxModem"
 0x127a	0x1005	"Hcf:www.linmodems.org"	"Rockwell International|HCF 56k V90 FaxModem"
 0x127a	0x1022	"Hcf:www.linmodems.org"	"Conexant Systems|HCF V.90 Modem"
@@ -3447,11 +3825,11 @@
 0x1289	0x1006	"unknown"	"AVC Technology Inc.| "
 0x128a	0xf001	"unknown"	"Asante Technologies Inc.|Ethernet 10/100 AsanteFAST 10/100 PCI Ethernet Adapter"
 0x128d	0x0021	"unknown"	"G2 Networks, Inc.|ATM155 Adapter"
-0x128e	0x0008	"sam9407"	"Hoontech Corporation/Samho Multi Tech Ltd.|ST128 WSS/SB"
-0x128e	0x0009	"unknown"	"Hoontech Corporation/Samho Multi Tech Ltd.|ST128 SAM9407"
-0x128e	0x000a	"unknown"	"Hoontech Corporation/Samho Multi Tech Ltd.|ST128 Game Port"
-0x128e	0x000b	"unknown"	"Hoontech Corporation/Samho Multi Tech Ltd.|ST128 MPU Port"
-0x128e	0x000c	"unknown"	"Hoontech Corporation/Samho Multi Tech Ltd.|ST128 Ctrl Port"
+0x128e	0x0008	"sam9407"	"Hoontech Corp./Samho Multi Tech Ltd.|ST128 WSS/SB"
+0x128e	0x0009	"unknown"	"Hoontech Corp./Samho Multi Tech Ltd.|ST128 SAM9407"
+0x128e	0x000a	"unknown"	"Hoontech Corp./Samho Multi Tech Ltd.|ST128 Game Port"
+0x128e	0x000b	"unknown"	"Hoontech Corp./Samho Multi Tech Ltd.|ST128 MPU Port"
+0x128e	0x000c	"unknown"	"Hoontech Corp./Samho Multi Tech Ltd.|ST128 Ctrl Port"
 0x1292	0xfc02	"unknown"	"Tritech Microelectronics|Pyramid3D TR25202"
 0x129a	0x0415	"unknown"	"VMETRO Inc.|PBT-415 PCI 66MHz Analyzer and 33MHz Exerciser"
 0x129a	0x0515	"unknown"	"VMETRO Inc.|PBT-515 PCI 66MHz Analyzer and Exerciser"
@@ -3463,6 +3841,7 @@
 0x12a3	0x8105	"unknown"	"Lucent Technologies|T8105 H100 Digital Switch"
 0x12a3	0xecb8	"unknown"	"Lucent Technologies|1646T00"
 0x12aa	0x556c	"unknown"	"SDL Communications Inc.|NAI HSSI Sniffer PCI Adapter"
+0x12ab	0x0002	"unknown"	"Yuan Yuan Enterprise Co., Ltd.|AU8830 [Vortex2] Based Sound Card With A3D Support"
 0x12ab	0x3000	"unknown"	"Yuan Yuan Enterprise Co Ltd|MPG-200C PCI DVD Decoder Card"
 0x12ae	0x0001	"acenic"	"Alteon Networks Inc.|AceNIC Gigabit Ethernet"
 0x12ae	0x0002	"acenic"	"Alteon Networks Inc.|AceNIC Gigabit Ethernet (Copper)"
@@ -3535,20 +3914,20 @@
 0x12cb	0x0033	"unknown"	"Antex Electronics Corp.|LX-22M"
 0x12cb	0x0034	"unknown"	"Antex Electronics Corp.|BX-8"
 0x12cb	0x0035	"unknown"	"Antex Electronics Corp.|BX-12e"
-0x12d2	0x0008	"Card:RIVA128"	"NVidia / SGS Thomson|NV1"
-0x12d2	0x0009	"Card:RIVA128"	"NVidia / SGS Thomson|DAC64"
-0x12d2	0x0018	"Card:RIVA128"	"NVidia / SGS Thomson|Riva128"
-0x12d2	0x0019	"Card:RIVA128"	"NVidia / SGS Thomson|Riva128ZX"
-0x12d2	0x0020	"Card:RIVA TNT"	"NVidia / SGS Thomson|TNT"
-0x12d2	0x0028	"Card:RIVA TNT2"	"NVidia / SGS Thomson|TNT2"
-0x12d2	0x0029	"Card:RIVA TNT2"	"NVidia / SGS Thomson|UTNT2"
-0x12d2	0x002a	"unknown"	"NVidia / SGS Thomson|NV5 Riva TNT2"
-0x12d2	0x002b	"unknown"	"NVidia / SGS Thomson|NV5 Riva TNT2"
-0x12d2	0x002c	"Card:RIVA TNT2"	"NVidia / SGS Thomson|VTNT2"
-0x12d2	0x002d	"Card:RIVA TNT2"	"NVidia / SGS Thomson|NVM64 Riva TNT2 Model 64"
-0x12d2	0x002e	"unknown"	"NVidia / SGS Thomson|NV6 Vanta"
-0x12d2	0x002f	"unknown"	"NVidia / SGS Thomson|NV6 Vanta"
-0x12d2	0x00a0	"Card:RIVA TNT2"	"NVidia / SGS Thomson|ITNT2"
+0x12d2	0x0008	"Card:RIVA128"	"nVidia / SGS Thomson|NV1"
+0x12d2	0x0009	"Card:RIVA128"	"nVidia / SGS Thomson|DAC64"
+0x12d2	0x0018	"Card:RIVA128"	"nVidia / SGS Thomson|Riva128"
+0x12d2	0x0019	"Card:RIVA128"	"nVidia / SGS Thomson|Riva128ZX"
+0x12d2	0x0020	"Card:RIVA TNT"	"nVidia / SGS Thomson|TNT"
+0x12d2	0x0028	"Card:RIVA TNT2"	"nVidia / SGS Thomson|TNT2"
+0x12d2	0x0029	"Card:RIVA TNT2"	"nVidia / SGS Thomson|UTNT2"
+0x12d2	0x002a	"unknown"	"nVidia / SGS Thomson|NV5 Riva TNT2"
+0x12d2	0x002b	"unknown"	"nVidia / SGS Thomson|NV5 Riva TNT2"
+0x12d2	0x002c	"Card:RIVA TNT2"	"nVidia / SGS Thomson|VTNT2"
+0x12d2	0x002d	"Card:RIVA TNT2"	"nVidia / SGS Thomson|NVM64 Riva TNT2 Model 64"
+0x12d2	0x002e	"unknown"	"nVidia / SGS Thomson|NV6 Vanta"
+0x12d2	0x002f	"unknown"	"nVidia / SGS Thomson|NV6 Vanta"
+0x12d2	0x00a0	"Card:RIVA TNT2"	"nVidia / SGS Thomson|ITNT2"
 0x12d4	0x0200	"unknown"	"Ulticom (Formerly DGM&S)|T1 Card"
 0x12d5	0x1000	"unknown"	"Equator Technologies|MAP-CA Broadband Signal Processor"
 0x12d5	0x1002	"unknown"	"Equator Technologies|MAP-1000 Digital Signal Processor"
@@ -3625,51 +4004,52 @@
 0x1319	0x0802	"fm801-gp"	"Fortemedia, Inc|Xwave QS3000A [FM801 game port]"
 0x1319	0x1000	"snd-fm801"	"Fortemedia, Inc|FM801 PCI Audio"
 0x1319	0x1001	"unknown"	"Fortemedia, Inc|FM801 PCI Joystick"
-0x131f	0x1000	"unknown"	"Siig Inc|CyberSerial (1-port) 16550"
-0x131f	0x1001	"unknown"	"Siig Inc|CyberSerial (1-port) 16650"
-0x131f	0x1002	"unknown"	"Siig Inc|CyberSerial (1-port) 16850"
+0x131f	0x1000	"8250_pci"	"Siig Inc|CyberSerial (1-port) 16550"
+0x131f	0x1001	"8250_pci"	"Siig Inc|CyberSerial (1-port) 16650"
+0x131f	0x1002	"8250_pci"	"Siig Inc|CyberSerial (1-port) 16850"
 0x131f	0x1010	"parport_serial"	"Siig Inc|Duet 1S(16550)+1P"
 0x131f	0x1011	"parport_serial"	"Siig Inc|Duet 1S(16650)+1P"
 0x131f	0x1012	"parport_serial"	"Siig Inc|Duet 1S(16850)+1P"
 0x131f	0x1020	"unknown"	"Siig Inc|CyberParallel (1-port)"
 0x131f	0x1021	"unknown"	"Siig Inc|CyberParallel (2-port)"
-0x131f	0x1030	"unknown"	"Siig Inc|CyberSerial (2-port) 16550"
-0x131f	0x1031	"unknown"	"Siig Inc|CyberSerial (2-port) 16650"
-0x131f	0x1032	"unknown"	"Siig Inc|CyberSerial (2-port) 16850"
+0x131f	0x1030	"8250_pci"	"Siig Inc|CyberSerial (2-port) 16550"
+0x131f	0x1031	"8250_pci"	"Siig Inc|CyberSerial (2-port) 16650"
+0x131f	0x1032	"8250_pci"	"Siig Inc|CyberSerial (2-port) 16850"
 0x131f	0x1034	"parport_serial"	"Siig Inc|Trio 2S(16550)+1P"
 0x131f	0x1035	"parport_serial"	"Siig Inc|Trio 2S(16650)+1P"
 0x131f	0x1036	"parport_serial"	"Siig Inc|Trio 2S(16850)+1P"
-0x131f	0x1050	"unknown"	"Siig Inc|CyberSerial (4-port) 16550"
-0x131f	0x1051	"unknown"	"Siig Inc|CyberSerial (4-port) 16650"
-0x131f	0x1052	"unknown"	"Siig Inc|CyberSerial (4-port) 16850"
-0x131f	0x2000	"unknown"	"Siig Inc|CyberSerial (1-port) 16550"
-0x131f	0x2001	"unknown"	"Siig Inc|CyberSerial (1-port) 16650"
-0x131f	0x2002	"unknown"	"Siig Inc|CyberSerial (1-port) 16850"
+0x131f	0x1050	"8250_pci"	"Siig Inc|CyberSerial (4-port) 16550"
+0x131f	0x1051	"8250_pci"	"Siig Inc|CyberSerial (4-port) 16650"
+0x131f	0x1052	"8250_pci"	"Siig Inc|CyberSerial (4-port) 16850"
+0x131f	0x2000	"8250_pci"	"Siig Inc|CyberSerial (1-port) 16550"
+0x131f	0x2001	"8250_pci"	"Siig Inc|CyberSerial (1-port) 16650"
+0x131f	0x2002	"8250_pci"	"Siig Inc|CyberSerial (1-port) 16850"
 0x131f	0x2010	"parport_serial"	"Siig Inc|Duet 1S(16550)+1P"
 0x131f	0x2011	"parport_serial"	"Siig Inc|Duet 1S(16650)+1P"
 0x131f	0x2012	"parport_serial"	"Siig Inc|Duet 1S(16850)+1P"
 0x131f	0x2020	"unknown"	"Siig Inc|CyberParallel (1-port)"
 0x131f	0x2021	"unknown"	"Siig Inc|CyberParallel (2-port)"
-0x131f	0x2030	"unknown"	"Siig Inc|CyberSerial (2-port) 16550"
-0x131f	0x2031	"unknown"	"Siig Inc|CyberSerial (2-port) 16650"
-0x131f	0x2032	"unknown"	"Siig Inc|CyberSerial (2-port) 16850"
+0x131f	0x2030	"8250_pci"	"Siig Inc|CyberSerial (2-port) 16550"
+0x131f	0x2031	"8250_pci"	"Siig Inc|CyberSerial (2-port) 16650"
+0x131f	0x2032	"8250_pci"	"Siig Inc|CyberSerial (2-port) 16850"
 0x131f	0x2040	"parport_serial"	"Siig Inc|Trio 1S(16550)+2P"
 0x131f	0x2041	"parport_serial"	"Siig Inc|Trio 1S(16650)+2P"
 0x131f	0x2042	"parport_serial"	"Siig Inc|Trio 1S(16850)+2P"
-0x131f	0x2050	"unknown"	"Siig Inc|CyberSerial (4-port) 16550"
-0x131f	0x2051	"unknown"	"Siig Inc|CyberSerial (4-port) 16650"
-0x131f	0x2052	"unknown"	"Siig Inc|CyberSerial (4-port) 16850"
+0x131f	0x2050	"8250_pci"	"Siig Inc|CyberSerial (4-port) 16550"
+0x131f	0x2051	"8250_pci"	"Siig Inc|CyberSerial (4-port) 16650"
+0x131f	0x2052	"8250_pci"	"Siig Inc|CyberSerial (4-port) 16850"
 0x131f	0x2060	"parport_serial"	"Siig Inc|Trio 2S(16550)+1P"
 0x131f	0x2061	"parport_serial"	"Siig Inc|Trio 2S(16650)+1P"
 0x131f	0x2062	"parport_serial"	"Siig Inc|Trio 2S(16850)+1P"
 0x1328	0x2048	"unknown"	"Quadrant International| "
+0x1331	0x0030	"unknown"	"Radisys Corp.|ENP-2611"
 0x1331	0x8200	"unknown"	"Radisys Corp.|82600 Host Bridge"
 0x1331	0x8201	"unknown"	"Radisys Corp.|82600 IDE"
 0x1331	0x8202	"unknown"	"Radisys Corp.|82600 USB"
 0x1331	0x8210	"unknown"	"Radisys Corp.|82600 PCI Bridge"
 0x1332	0x5415	"umem"	"Micro Memory|MM-5415CN PCI Memory Module with Battery Backup"
 0x1332	0x5425	"umem"	"Micro Memory|MM-5425CN PCI 64/66 Memory Module with Battery Backup"
-0x1332	0x6155	"umem"	""
+0x1332	0x6155	"umem"	"Micro Memory|"
 0x133d	0x1000	"unknown"	"Prisa Networks|SST-5136-PFB-PCI Industrial I/O Card"
 0x1344	0x3240	"unknown"	"Micron Technology, Inc.|CopperHead CopperTail SC1 AMC AC97"
 0x1344	0x3320	"unknown"	"Micron Technology, Inc.|MT8LLN21PADF North Bridge"
@@ -3679,6 +4059,7 @@
 0x134a	0x0001	"dtc"	"DTC Technology Corp.|Domex 536"
 0x134a	0x0002	"dtc"	"DTC Technology Corp.|Domex DMX3194UP SCSI Adapter"
 0x134a	0x3510	0xafff	0xffff	"unknown"	"DTC Technology Corp.|DTC50C18 scsi"
+0x134d	0x2189	"unknown"	"PCTel Inc|HSP56 MicroModem"
 0x134d	0x2486	"unknown"	"PCTEL Inc.|2304WT V.92 MDC Modem"
 0x134d	0x7890	"unknown"	"Pctel Inc|HSP MicroModem 56"
 0x134d	0x7891	"unknown"	"Pctel Inc|HSP MicroModem 56"
@@ -3696,12 +4077,12 @@
 0x1353	0x0004	"unknown"	"Thales Idatys|PCI-S0"
 0x1353	0x0005	"unknown"	"Thales Idatys|PCI-FUT-S0"
 0x135a	0x0224	"unknown"	"Brain Boxes Limited|PLX9050 PLX PCI Bus Logic"
-0x135c	0x0010	"unknown"	"Quatech|QSC 100"
-0x135c	0x0020	"unknown"	"Quatech|DSC 100"
+0x135c	0x0010	"8250_pci"	"Quatech|QSC 100"
+0x135c	0x0020	"8250_pci"	"Quatech|DSC 100"
 0x135c	0x0030	"unknown"	"Quatech|DSC 200"
 0x135c	0x0040	"unknown"	"Quatech|QSC 200"
-0x135c	0x0050	"unknown"	"Quatech|ESC 100D"
-0x135c	0x0060	"unknown"	"Quatech|ESC 100M"
+0x135c	0x0050	"8250_pci"	"Quatech|ESC 100D"
+0x135c	0x0060	"8250_pci"	"Quatech|ESC 100M"
 0x135c	0x00f0	"unknown"	"Quatech Inc|MPAC-100 Syncronous Serial Card (Zilog 85230)"
 0x135c	0x0170	"unknown"	"Quatech Inc|QSCLP-100"
 0x135c	0x0180	"unknown"	"Quatech Inc|DSCLP-100"
@@ -3710,46 +4091,60 @@
 0x135c	0x01b0	"unknown"	"Quatech Inc|DSCLP-200/300"
 0x135c	0x01c0	"unknown"	"Quatech Inc|SSCLP-200/300"
 0x135e	0x5101	"unknown"	"Sealevel Systems Inc.|5101 Route 56"
-0x135e	0x7101	"unknown"	"Sealevel Systems Inc|Single Port RS-232/422/485/530"
-0x135e	0x7201	"unknown"	"Sealevel Systems Inc|Dual Port RS-232/422/485 Interface"
-0x135e	0x7202	"unknown"	"Sealevel Systems Inc|Dual Port RS-232 Interface"
-0x135e	0x7401	"unknown"	"Sealevel Systems Inc|Four Port RS-232 Interface"
-0x135e	0x7402	"unknown"	"Sealevel Systems Inc|Four Port RS-422/485 Interface"
-0x135e	0x7801	"unknown"	"Sealevel Systems Inc|Eight Port RS-232 Interface"
+0x135e	0x7101	"8250_pci"	"Sealevel Systems Inc|Single Port RS-232/422/485/530"
+0x135e	0x7201	"8250_pci"	"Sealevel Systems Inc|Dual Port RS-232/422/485 Interface"
+0x135e	0x7202	"8250_pci"	"Sealevel Systems Inc|Dual Port RS-232 Interface"
+0x135e	0x7401	"8250_pci"	"Sealevel Systems Inc|Four Port RS-232 Interface"
+0x135e	0x7402	"8250_pci"	"Sealevel Systems Inc|Four Port RS-422/485 Interface"
+0x135e	0x7801	"8250_pci"	"Sealevel Systems Inc|Eight Port RS-232 Interface"
 0x135e	0x8001	"unknown"	"Sealevel Systems Inc|8001 Digital I/O Adapter"
+0x1360	0x0101	"unknown"	"Meinberg Funkuhren|PCI32 DCF77 Radio Clock"
+0x1360	0x0102	"unknown"	"Meinberg Funkuhren|PCI509 DCF77 Radio Clock"
+0x1360	0x0103	"unknown"	"Meinberg Funkuhren|PCI510 DCF77 Radio Clock"
+0x1360	0x0201	"unknown"	"Meinberg Funkuhren|GPS167PCI GPS Receiver"
+0x1360	0x0202	"unknown"	"Meinberg Funkuhren|GPS168PCI GPS Receiver"
+0x1360	0x0203	"unknown"	"Meinberg Funkuhren|GPS169PCI GPS Receiver"
+0x1360	0x0301	"unknown"	"Meinberg Funkuhren|TCR510PCI IRIG Receiver"
 0x1365	0x9050	"hysdn"	"Hypercope Corp.|HYSDN"
-0x136b	0xff01	"meye"	"Kawasaki Steel Corporation|MEYE Video Adapter"
+0x136b	0xff01	"meye"	"Kawasaki Steel Corp.|MEYE Video Adapter"
 0x1371	0x434e	"unknown"	"CNet Technology Inc|GigaCard Network Adapter"
 0x137a	0x0001	"unknown"	"Mark Of The Unicorn Inc| "
 0x1382	0x2048	"unknown"	"Marian - Electronic & Software|Prodif Plus sound card"
 0x1382	0x2088	"unknown"	"Marian - Electronic & Software|Marc-8 MIDI 8 channel audio card"
-0x1385	0x3872	"prism2_pci"	""
+0x1385	0x3872	"prism2_pci"	"Marian - Electronic & Software|"
 0x1385	0x4100	"orinoco_plx"	"Netgear|802.11b Wireless Adapter (MA301)"
 0x1385	0x4105	"unknown"	"Netgear|MA311 802.11b wireless adapter"
+0x1385	0x4400	"unknown"	"Netgear|WAG511 802.11a/b/g Dual Band Wireless PC Card"
+0x1385	0x4600	"unknown"	"Netgear|WAG511 802.11a/b/g Dual Band Wireless PC Card"
+0x1385	0x4601	"unknown"	"Netgear|WAG511 802.11a/b/g Dual Band Wireless PC Card"
+0x1385	0x4610	"unknown"	"Netgear|WAG511 802.11a/b/g Dual Band Wireless PC Card"
+0x1385	0x4a00	"unknown"	"Netgear|WAG311 802.11abg Wireless Adapter"
+0x1385	0x4c00	"unknown"	"Netgear|WG311v2 54 Mbps Wireless PCI Adapter"
 0x1385	0x620a	"acenic"	"Netgear|GA620"
 0x1385	0x622a	"unknown"	"Netgear|GA622"
 0x1385	0x630a	"acenic"	"Netgear|GA630"
+0x1385	0xf004	"unknown"	"Netgear|FA310TX"
 0x1385	0xf311	"unknown"	"Netgear|FA311"
 0x1385	0xf312	"unknown"	"Netgear| "
 0x1389	0x0001	"applicom"	"Applicom International|PCI1500PFB [Intelligent fieldbus adaptor]"
-0x1389	0x0002	"applicom"	""
-0x1389	0x0003	"applicom"	""
+0x1389	0x0002	"applicom"	"Applicom International|"
+0x1389	0x0003	"applicom"	"Applicom International|"
 0x1393	0x1010	"unknown"	"Moxa Technologies Co Ltd| "
 0x1393	0x1020	"unknown"	"Moxa Technologies Co Ltd| "
-0x1393	0x1040	"mxser"	""
-0x1393	0x1041	"unknown"	"Moxa Technologies Co Ltd| "
+0x1393	0x1040	"mxser"	"Moxa Technologies Co Ltd|Smartio C104H/PCI"
+0x1393	0x1041	"mxser"	"Moxa Technologies Co Ltd| "
 0x1393	0x1042	"unknown"	"Moxa Technologies Co Ltd| "
-0x1393	0x1140	"mxser"	""
-0x1393	0x1141	"mxser"	""
+0x1393	0x1140	"mxser"	"Moxa Technologies Co Ltd|"
+0x1393	0x1141	"mxser"	"Moxa Technologies Co Ltd|Industrio CP-114"
 0x1393	0x1320	"mxser"	"Moxa Technologies Co Ltd|CP-132 Industio"
 0x1393	0x1321	"unknown"	"Moxa Technologies Co Ltd| "
 0x1393	0x1340	"unknown"	"Moxa Technologies Co Ltd| "
 0x1393	0x1401	"unknown"	"Moxa Technologies Co Ltd| "
-0x1393	0x1680	"mxser"	""
+0x1393	0x1680	"mxser"	"Moxa Technologies Co Ltd|Smartio C168H/PCI"
 0x1393	0x1681	"unknown"	"Moxa Technologies Co Ltd| "
-0x1393	0x2040	"moxa"	""
-0x1393	0x2180	"moxa"	""
-0x1393	0x3200	"moxa"	""
+0x1393	0x2040	"moxa"	"Moxa Technologies Co Ltd|Intellio CP-204J"
+0x1393	0x2180	"moxa"	"Moxa Technologies Co Ltd|Intellio C218 Turbo PCI"
+0x1393	0x3200	"moxa"	"Moxa Technologies Co Ltd|Intellio C320 Turbo PCI"
 0x1393	0x5020	"unknown"	"Moxa Technologies Co Ltd| "
 0x1394	0x0001	"unknown"	"Level One Communications|LXT1001 Gigabit Ethernet"
 0x1397	0x0b4d	"unknown"	"Cologne Chip Designs GmbH|HFC-8S 16B8D8S0 ISDN HDLC FIFO Controller"
@@ -3775,27 +4170,28 @@
 0x13a3	0x0016	"unknown"	"Hifn Inc.|8065 Security Processor"
 0x13a3	0x0017	"unknown"	"Hifn Inc.|8165 Security Processor"
 0x13a3	0x0018	"unknown"	"Hifn Inc.|8154 Security Processor"
-0x13a8	0x0154	"unknown"	"Exar Corp.|XR17C154 PCI Bus Quad UART"
-0x13a8	0x0158	"unknown"	"Exar Corp.|XR17C158 PCI Bus Octal UART"
-0x13c0	0x0010	"synclink"	"Microgate Corporation|SyncLink WAN Adapter"
-0x13c0	0x0020	"unknown"	"Microgate Corporation|SyncLink SCC Adapter"
-0x13c0	0x0030	"synclinkmp"	""
-0x13c0	0x0210	"synclink"	"Microgate Corporation|SyncLink Adapter v2"
+0x13a8	0x0152	"8250_pci"	"Exar Corp.|XR17C152 PCI Bus Quad UART"
+0x13a8	0x0154	"8250_pci"	"Exar Corp.|XR17C154 PCI Bus Quad UART"
+0x13a8	0x0158	"8250_pci"	"Exar Corp.|XR17C158 PCI Bus Octal UART"
+0x13c0	0x0010	"synclink"	"Microgate Corp.|SyncLink WAN Adapter"
+0x13c0	0x0020	"unknown"	"Microgate Corp.|SyncLink SCC Adapter"
+0x13c0	0x0030	"synclinkmp"	"Microgate Corp.|SyncLink Multiport Adapter"
+0x13c0	0x0210	"synclink"	"Microgate Corp.|SyncLink Adapter v2"
 0x13c1	0x1000	"3w-xxxx"	"3ware Inc|3ware ATA-RAID"
 0x13c1	0x1001	"3w-xxxx"	"3ware Inc|3ware 7000-series ATA-RAID"
-0x13c1	0x1002	"3w-xxxx"	"3ware Inc|3ware ATA-RAID"
+0x13c1	0x1002	"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"
 0x13c7	0x0adc	"unknown"	"Blue Chip Technology Ltd|Multi-Function Analogue/Digital IO card"
-0x13d0	0x2103	"unknown"	"B2C2 Inc|T228502 B2C2 Sky2PC Core Chip"
-0x13d0	0x2200	"unknown"	"B2C2 Inc| "
+0x13d0	0x2103	"skystar2"	"B2C2 Inc|T228502 B2C2 Sky2PC Core Chip"
+0x13d0	0x2200	"skystar2"	"B2C2 Inc| "
 0x13d1	0x2bd1	"ISDN:hisax"	"Abocom Systems Inc|ISDN Adapter"
 0x13d1	0xab02	"tulip"	"Abocom Systems Inc|Ethernet Adapter"
 0x13d1	0xab03	"tulip"	"Abocom Systems Inc|Ethernet Adapter"
 0x13d1	0xab06	"8139too"	"Abocom Systems Inc|FE2000VX CardBus /Atelco Fibreline Ethernet Adptr"
 0x13d1	0xab08	"tulip"	"Abocom Systems Inc|Ethernet Adapter"
-0x13d7	0x8086	"unknown"	"Toshiba Engineering Corporation|ac97 note"
+0x13d7	0x8086	"unknown"	"Toshiba Engineering Corp.|ac97 note"
 0x13df	0x0001	"unknown"	"E-Tech Inc|PCI56RVP Modem"
 0x13ea	0x3131	"unknown"	"Dallas Semiconductor|DS3131 BoSS Bit Synchronous HDLC Controller"
 0x13ea	0x3134	"unknown"	"Dallas Semiconductor|DS3134 Chateau Channelized T1/E1/HDLC Controller"
@@ -3818,32 +4214,32 @@
 0x1400	0x0003	"unknown"	"ArtX Inc| "
 0x1400	0x0004	"unknown"	"ArtX Inc| "
 0x1400	0x1401	"epic100"	"Standard Microsystems Corp [SMC]|9432 TX"
-0x1407	0x0100	"unknown"	"Lava Computer mfg Inc|Lava Dual Serial"
-0x1407	0x0101	"unknown"	"Lava Computer mfg Inc|Lava Quatro A"
-0x1407	0x0102	"unknown"	"Lava Computer mfg Inc|Lava Quatro B"
+0x1407	0x0100	"8250_pci"	"Lava Computer mfg Inc|Lava Dual Serial"
+0x1407	0x0101	"8250_pci"	"Lava Computer mfg Inc|Lava Quatro A"
+0x1407	0x0102	"8250_pci"	"Lava Computer mfg Inc|Lava Quatro B"
 0x1407	0x0110	"unknown"	"Lava Computer MFG Inc.|Lava DSerial PCI Port A"
 0x1407	0x0111	"unknown"	"Lava Computer MFG Inc.|Lava DSerial PCI Port B"
 0x1407	0x0120	"unknown"	"Lava Computer MFG Inc.| "
 0x1407	0x0121	"unknown"	"Lava Computer MFG Inc.| "
-0x1407	0x0180	"unknown"	"Lava Computer MFG Inc.|Lava Octopus PCI Ports 1-4"
-0x1407	0x0181	"unknown"	"Lava Computer MFG Inc.|Lava Octopus PCI Ports 5-8"
-0x1407	0x0200	"unknown"	"Lava Computer mfg Inc|Lava Port Plus"
-0x1407	0x0201	"unknown"	"Lava Computer mfg Inc|Lava Quad A"
-0x1407	0x0202	"unknown"	"Lava Computer mfg Inc|Lava Quad B"
+0x1407	0x0180	"8250_pci"	"Lava Computer MFG Inc.|Lava Octopus PCI Ports 1-4"
+0x1407	0x0181	"8250_pci"	"Lava Computer MFG Inc.|Lava Octopus PCI Ports 5-8"
+0x1407	0x0200	"8250_pci"	"Lava Computer mfg Inc|Lava Port Plus"
+0x1407	0x0201	"8250_pci"	"Lava Computer mfg Inc|Lava Quad A"
+0x1407	0x0202	"8250_pci"	"Lava Computer mfg Inc|Lava Quad B"
 0x1407	0x0220	"unknown"	"Lava Computer mfg Inc|Lava Quattro PCI Ports A/B"
 0x1407	0x0221	"unknown"	"Lava Computer mfg Inc|Lava Quattro PCI Ports C/D"
 0x1407	0x0400	"unknown"	"Lava Computer MFG Inc.|Lava 8255 PIO PCI"
-0x1407	0x0500	"unknown"	"Lava Computer mfg Inc|Lava Single Serial"
+0x1407	0x0500	"8250_pci"	"Lava Computer mfg Inc|Lava Single Serial"
 0x1407	0x0510	"unknown"	"Lava Computer MFG Inc.|Lava SP Serial 550 PCI"
 0x1407	0x0511	"unknown"	"Lava Computer MFG Inc.|Lava SP BIDIR Parallel PCI"
-0x1407	0x0600	"unknown"	"Lava Computer mfg Inc|Lava Port 650"
+0x1407	0x0600	"8250_pci"	"Lava Computer mfg Inc|Lava Port 650"
 0x1407	0x0a00	"unknown"	"Lava Computer MFG Inc|LavaPort PCI COM Port Accelerator"
 0x1407	0x8000	"unknown"	"Lava Computer mfg Inc|Lava Parallel"
 0x1407	0x8001	"unknown"	"Lava Computer MFG Inc|Lava Dual Parallel port A"
 0x1407	0x8002	"unknown"	"Lava Computer mfg Inc|Lava Dual Parallel port A"
 0x1407	0x8003	"unknown"	"Lava Computer mfg Inc|Lava Dual Parallel port B"
 0x1407	0x8800	"unknown"	"Lava Computer mfg Inc|BOCA Research IOPPAR"
-0x1409	0x7168	"unknown"	"Timedia Technology Co Ltd|Multi I/O card"
+0x1409	0x7168	"8250_pci"	"Timedia Technology Co Ltd|Multi I/O card"
 0x1409	0x7268	"unknown"	"Timedia Technology Co Ltd|SUN1888 Simple Comm. Controller"
 0x140b	0x0610	"unknown"	"Ramix Inc| "
 0x1412	0x1712	"snd-ice1712"	"IC Ensemble Inc|ICE1712 [Envy24]"
@@ -3851,20 +4247,20 @@
 0x1415	0x8401	"unknown"	"Oxford Semiconductor, Ltd.|OX9162 PCI Bridge"
 0x1415	0x8403	"unknown"	"Oxford Semiconductor, Ltd.|OX12PCI840 PCI Parallel Port"
 0x1415	0x9500	"unknown"	"Oxford Semiconductor, Ltd.|PCI Function"
-0x1415	0x9501	"unknown"	"Oxford Semiconductor, Ltd.|OX16PCI954 PCI UARTs"
+0x1415	0x9501	"8250_pci"	"Oxford Semiconductor, Ltd.|OX16PCI954 PCI UARTs"
 0x1415	0x950a	"unknown"	"Oxford Semiconductor, Ltd.|OX16PCI954 Dual PCI UART"
 0x1415	0x950b	"unknown"	"Oxford Semiconductor Ltd|OXCB950 Cardbus 16950 UART"
 0x1415	0x9510	"unknown"	"Oxford Semiconductor, Ltd.|PCI Function"
-0x1415	0x9511	"unknown"	"Oxford Semiconductor, Ltd.|OX16PCI954 PCI Bridge"
+0x1415	0x9511	"8250_pci"	"Oxford Semiconductor, Ltd.|OX16PCI954 PCI Bridge"
 0x1415	0x9512	"unknown"	"Oxford Semiconductor, Ltd.|OX16PCI954 32-bit PCI Bridge"
 0x1415	0x9513	"unknown"	"Oxford Semiconductor, Ltd.|OX16PCI954 PCI Parallel Port"
-0x1415	0x9521	"unknown"	"Oxford Semiconductor Ltd|OX16PCI952 (Dual 16950 UART)"
+0x1415	0x9521	"8250_pci"	"Oxford Semiconductor Ltd|OX16PCI952 (Dual 16950 UART)"
 0x1415	0x9523	"unknown"	"Oxford Semiconductor Ltd|OX12PCI952 Integrated Parallel Port"
 0x141f	0x6181	"unknown"	"Visiontech Ltd|KFIR MPEG decoder"
 0x1420	0x8002	"unknown"	"Psion Dacom plc|Gold Card NetGlobal 56k+10/100Mb CardBus (Ethernet part)"
 0x1420	0x8003	"unknown"	"Psion Dacom plc|Gold Card NetGlobal 56k+10/100Mb CardBus (Modem part)"
 0x142e	0x4020	"unknown"	"Vitec Multimedia|VM2-2 [Video Maker 2] MPEG1/2 Encoder"
-0x1432	0x9130	"8139too"	""
+0x1432	0x9130	"8139too"	"Edimax Computer Co.|RTL81xx Fast Ethernet"
 0x1448	0x0001	"unknown"	"Alesis Studio|ADAT/EDIT Audio Editing"
 0x144a	0x7230	"unknown"	"ADLINK Technology Inc| "
 0x144a	0x7248	"unknown"	"ADLINK Technology Inc|PCI-7248"
@@ -3875,6 +4271,7 @@
 0x144a	0x7434	"unknown"	"Adlink Technology|PCI-7434"
 0x144a	0x7841	"unknown"	"Adlink Technology|PCI-7841"
 0x144a	0x8133	"unknown"	"Adlink Technology|PCI-8133"
+0x144a	0x8164	"unknown"	"Adlink Technology|PCI-8164"
 0x144a	0x8554	"unknown"	"Adlink Technology|PCI-8554"
 0x144a	0x9111	"unknown"	"Adlink Technology|PCI-9111"
 0x144a	0x9113	"unknown"	"Adlink Technology|PCI-9113"
@@ -3884,6 +4281,7 @@
 0x145f	0x0001	"unknown"	"Baldor Electric Company|NextMove PCI"
 0x1461	0x0002	"bttv"	"Avermedia|TVCapture 98"
 0x1462	0x5071	"unknown"	"Micro-Star International Co Ltd|Audio controller"
+0x1462	0x6825	"unknown"	"Micro-Star International Co., Ltd.|PCI Card wireless 11g [PC54G]"
 0x1462	0x7120	"unknown"	"Micro-Star International Co Ltd| "
 0x1462	0x8725	"unknown"	"Micro-Star International Co., Ltd.|NVIDIA NV25 [GeForce4 Ti 4600] VGA Adapter"
 0x1462	0x9000	"unknown"	"Micro-Star International Co., Ltd.|NVIDIA NV28 [GeForce4 Ti 4800] VGA Adapter"
@@ -3894,7 +4292,7 @@
 0x148d	0x1003	"Hcf:www.linmodems.org"	"DIGICOM Systems, Inc.|HCF 56k Data/Fax Modem"
 0x149d	0x0001	"unknown"	"NEWTEK Inc|Video Toaster for PC"
 0x14af	0x0050	"snd-cs46xx"	"Hercules|Game Theatre XP"
-0x14af	0x7102	"unknown"	"Guillemot Corporation|3D Prophet II MX"
+0x14af	0x7102	"unknown"	"Guillemot Corp.|3D Prophet II MX"
 0x14b3	0x0000	"unknown"	"XPEED Inc|DSL NIC"
 0x14b5	0x0200	"unknown"	"Creamware GmBH|Scope"
 0x14b5	0x0300	"unknown"	"Creamware GmBH|Pulsar"
@@ -3914,32 +4312,33 @@
 0x14b9	0x3500	"unknown"	"Aironet Wireless Communication|PC3500 FH Wireless PCI LAN Adapter"
 0x14b9	0x4500	"aironet4500_card"	"AIRONET Wireless Communications|"
 0x14b9	0x4800	"aironet4500_card"	"AIRONET Wireless Communications|"
-0x14b9	0x5000	"airo"	""
+0x14b9	0x5000	"airo"	"AIRONET Wireless Communications|"
 0x14b9	0xa504	"airo"	"AIRONET Wireless Communications|Cisco Aironet Wireless 802.11b"
 0x14b9	0xa505	"unknown"	"AIRONET Wireless Communications|Cisco Aironet CB20a 802.11a Wireless LAN Adapter"
 0x14c1	0x8043	"unknown"	"Myricom Inc.|LANai 9.2 0129 MyriNet"
 0x14d2	0x8001	"unknown"	"Oxford Semiconductor|Visial Systems VScom PCI-010L Contoller"
 0x14d2	0x8002	"unknown"	"Oxford Semiconductor|Visual Systems PCI-020L Controller"
-0x14d2	0x8010	"unknown"	"Oxford Semiconductor|Visual Systems VScom PCI-100L Controller"
+0x14d2	0x8010	"8250_pci"	"Oxford Semiconductor|Visual Systems VScom PCI-100L Controller"
 0x14d2	0x8011	"parport_serial"	"Oxford Semiconductor|VScom Controller"
-0x14d2	0x8020	"unknown"	"Oxford Semiconductor|Visual Systems VScom PCI-200L Controller"
+0x14d2	0x8020	"8250_pci"	"Oxford Semiconductor|Visual Systems VScom PCI-200L Controller"
 0x14d2	0x8021	"parport_serial"	"Oxford Semiconductor|VScom PCI-210L Controller"
-0x14d2	0x8040	"unknown"	"Oxford Semiconductor|Visual Systems VScom PCI-400L Controller"
+0x14d2	0x8040	"8250_pci"	"Oxford Semiconductor|Visual Systems VScom PCI-400L Controller"
 0x14d2	0x8041	"unknown"	"Oxford Semiconductor|Visual Systems VScom PCI-410L Controller"
 0x14d2	0x8042	"unknown"	"Oxford Semiconductor|Visual Systems VScom PCI-420L Controller"
-0x14d2	0x8080	"unknown"	"Oxford Semiconductor|Visual Systems VScom PCI-800L Controller"
+0x14d2	0x8080	"8250_pci"	"Oxford Semiconductor|Visual Systems VScom PCI-800L Controller"
 0x14d2	0xa000	"unknown"	"Oxford Semiconductor|Visual Systems VScom PCI-010H Controller"
-0x14d2	0xa001	"unknown"	"Titan|Titan 100"
-0x14d2	0xa003	"unknown"	"Titan|Titan 400"
-0x14d2	0xa004	"unknown"	"Titan|Titan 800B"
-0x14d2	0xa005	"unknown"	"Titan|Titan 200"
+0x14d2	0xa001	"8250_pci"	"Titan|Titan 100"
+0x14d2	0xa003	"8250_pci"	"Titan|Titan 400"
+0x14d2	0xa004	"8250_pci"	"Titan|Titan 800B"
+0x14d2	0xa005	"8250_pci"	"Titan|Titan 200"
 0x14d2	0xe001	"unknown"	"Oxford Semiconductor|Visial Systems VScom PCI-010HV2"
 0x14d2	0xe010	"unknown"	"Oxford Semiconductor|Visual Systems VScom PCI-100HV2"
 0x14d2	0xe020	"unknown"	"Oxford Semiconductor|Visual Systems VScom PCI-200HV2"
 0x14d2	0xffff	"unknown"	"Oxford Semiconductor|Dummy Controller"
-0x14d4	0x0400	"unknown"	"Panacom|Quadmodem"
-0x14d4	0x0402	"unknown"	"Panacom|Dualmodem"
+0x14d4	0x0400	"8250_pci"	"Panacom|Quadmodem"
+0x14d4	0x0402	"8250_pci"	"Panacom|Dualmodem"
 0x14d9	0x0010	"unknown"	"Alpha Processor Inc|AP1011 HyperTransport-PCI Bridge [Sturgeon]"
+0x14d9	0x9000	"unknown"	"Alliance Semiconductor Corporation|AS90L10204/10208 HyperTransport to PCI-X Bridge"
 0x14db	0x2100	"unknown"	"Avlab Technology Inc.|PCI IO 1S"
 0x14db	0x2101	"unknown"	"Avlab Technology Inc.|PCI IO 1S-650"
 0x14db	0x2102	"unknown"	"Avlab Technology Inc.|PCI IO 1S-850"
@@ -3963,9 +4362,9 @@
 0x14db	0x2160	"parport_serial"	"Avlab Technology Inc.|PCI IO 2S1P"
 0x14db	0x2161	"parport_serial"	"Avlab Technology Inc.|PCI IO 2S1P-650"
 0x14db	0x2162	"parport_serial"	"Avlab Technology Inc.|PCI IO 2S1P-850"
-0x14db	0x2180	"unknown"	"Avlab Technology Inc.|PCI IO 8S"
+0x14db	0x2180	"8250_pci"	"Avlab Technology Inc.|PCI IO 8S"
 0x14db	0x2181	"unknown"	"Avlab Technology Inc.|PCI IO 8S-654"
-0x14db	0x2182	"unknown"	"Avlab Technology Inc.|PCI IO 8S-850"
+0x14db	0x2182	"8250_pci"	"Avlab Technology Inc.|PCI IO 8S-850"
 0x14dc	0x0000	"unknown"	"Amplicon Liveline Ltd|PCI230"
 0x14dc	0x0001	"unknown"	"Amplicon Liveline Ltd|PCI242"
 0x14dc	0x0002	"unknown"	"Amplicon Liveline Ltd|PCI244"
@@ -3979,49 +4378,119 @@
 0x14dc	0x000a	"unknown"	"Amplicon Liveline Ltd|PCI272 72-channel digital I/O"
 0x14dc	0x000b	"unknown"	"Amplicon Liveline Ltd|PCI215 48-channel digital I/O (w/ 6 timers)"
 0x14dc	0x000c	"unknown"	"Amplicon Liveline Ltd|PCI263 16-channel reed relay output"
-0x14e4	0x1644	"tg3"	"Broadcom Corporation|BCM5700 1000BaseTX"
-0x14e4	0x1645	"tg3"	"Broadcom Corporation|BCM5701 1000BaseTX"
-0x14e4	0x1646	"tg3"	"Broadcom Corporation|NetXtreme BCM5702 Gigabit Ethernet"
-0x14e4	0x1647	"tg3"	"Broadcom Corporation|BCM5701 1000BaseTX"
-0x14e4	0x1648	"bcm5700"	"Broadcom Corporation|BCM5704 CIOB-E 1000BaseTX"
-0x14e4	0x1649	"tg3"	""
-0x14e4	0x164d	"tg3"	"Broadcom Corporation|NetXtreme BCM5702FE Gigabit Ethernet"
-0x14e4	0x1653	"bcm5700"	"Broadcom Corporation|BCM5705 1000BaseTX"
-0x14e4	0x1654	"bcm5700"	""
-0x14e4	0x165d	"bcm5700"	"Broadcom Corporation|BCM5705M 1000BaseTX"
-0x14e4	0x165e	"bcm5700"	""
-0x14e4	0x166d	"unknown"	"Broadcom Corporation| "
-0x14e4	0x166e	"tg3"	""
-0x14e4	0x1696	"tg3"	"Broadcom Corporation|NetXtreme BCM5782 Gigabit Ethernet"
-0x14e4	0x169c	"bcm5700"	"Broadcom Corporation|NetXtreme BCM5788 Gigabit Ethernet"
-0x14e4	0x16a6	"tg3"	"Broadcom Corporation|NetXtreme BCM5702X Gigabit Ethernet"
-0x14e4	0x16a7	"tg3"	"Broadcom Corporation|NetXtreme BCM5703X Gigabit Ethernet"
-0x14e4	0x16a8	"bcm5700"	"Broadcom Corporation|NetXtreme BCM5704X Gigabit Ethernet"
-0x14e4	0x16c6	"tg3"	"Broadcom Corporation|NetXtreme BCM5702 Gigabit Ethernet"
-0x14e4	0x16c7	"tg3"	"Broadcom Corporation|NetXtreme BCM5703 Gigabit Ethernet"
-0x14e4	0x170c	"bcm4400"	""
-0x14e4	0x170d	"bcm5700"	"Broadcom Corporation|NetXtreme BCM5700 Ethernet"
-0x14e4	0x170e	"bcm5700"	"Broadcom Corporation|NetXtreme BCM5700 Ethernet"
-0x14e4	0x4210	"unknown"	"Broadcom Corporation|BCM4210 iLine10 HomePNA 2.0"
-0x14e4	0x4211	"unknown"	"Broadcom Corporation|BCM HPNA 10Mb/s NIC"
-0x14e4	0x4212	"unknown"	"Broadcom Corporation|BCM V.90 56k Modem"
-0x14e4	0x4301	"unknown"	"Broadcom Corporation|BCM4301 802.11b"
-0x14e4	0x4320	"unknown"	"Broadcom Corporation|BCM94306 802.11g NIC"
-0x14e4	0x4324	"unknown"	"Broadcom Corporation|BCM4309 802.11a/b/g"
-0x14e4	0x4401	"bcm4400"	"Broadcom Corporation|BCM4401 100Base-T"
-0x14e4	0x4402	"bcm4400"	"Broadcom Corporation|BCM4402 Integrated 10/100BaseT"
-0x14e4	0x4410	"unknown"	"Broadcom Corporation|BCM4413 iLine32 HomePNA 2.0"
-0x14e4	0x4411	"unknown"	"Broadcom Corporation|BCM4413 V.90 56k modem"
-0x14e4	0x4412	"unknown"	"Broadcom Corporation|BCM4413 10/100BaseT"
-0x14e4	0x5690	"unknown"	"Broadcom Corporation| "
-0x14e4	0x5802	"unknown"	"Broadcom Corporation|BCM5802 The BCM5802 Security Processor integrates Broadcom’s IPSec engine (DES, 3DES, HMAC-SHA-1, HMAC-MD5),"
-0x14e4	0x5805	"unknown"	"Broadcom Corporation|BCM5805 The BCM5805 Security Processor integrates a high-performance IPSec engine (DES, 3DES, HMAC-SHA-1, HM"
-0x14e4	0x5820	"bcm5820"	"Broadcom Corporation|BCM5820 Crypto Accelerator"
-0x14e4	0x5821	"bcm5820"	"Broadcom Corporation|BCM5821 Crypto Accelerator"
+0x14e4	0x0800	"unknown"	"Broadcom Corp.|Sentry5 Chipcommon I/O Controller"
+0x14e4	0x0804	"unknown"	"Broadcom Corp.|Sentry5 PCI Bridge"
+0x14e4	0x0805	"unknown"	"Broadcom Corp.|Sentry5 MIPS32 CPU"
+0x14e4	0x0806	"unknown"	"Broadcom Corp.|Sentry5 Ethernet Controller"
+0x14e4	0x080b	"unknown"	"Broadcom Corp.|Sentry5 Crypto Accelerator"
+0x14e4	0x080f	"unknown"	"Broadcom Corp.|Sentry5 DDR/SDR RAM Controller"
+0x14e4	0x0811	"unknown"	"Broadcom Corp.|Sentry5 External Interface Core"
+0x14e4	0x0816	"unknown"	"Broadcom Corp.|BCM3302 Sentry5 MIPS32 CPU"
+0x14e4	0x1644	"tg3"	"Broadcom Corp.|BCM5700 1000BaseTX"
+0x14e4	0x1645	"tg3"	"Broadcom Corp.|BCM5701 1000BaseTX"
+0x14e4	0x1646	"tg3"	"Broadcom Corp.|NetXtreme BCM5702 Gigabit Ethernet"
+0x14e4	0x1647	"tg3"	"Broadcom Corp.|BCM5701 1000BaseTX"
+0x14e4	0x1648	"bcm5700"	"Broadcom Corp.|BCM5704 CIOB-E 1000BaseTX"
+0x14e4	0x1649	"tg3"	"Broadcom Corp.|BCM5704S 1000BaseTX"
+0x14e4	0x164a	"unknown"	"Broadcom Corporation|NetXtreme II BCM5706 Gigabit Ethernet"
+0x14e4	0x164d	"tg3"	"Broadcom Corp.|NetXtreme BCM5702FE Gigabit Ethernet"
+0x14e4	0x1653	"bcm5700"	"Broadcom Corp.|BCM5705 1000BaseTX"
+0x14e4	0x1654	"bcm5700"	"Broadcom Corp.|NetXtreme BCM5705-2 Gigabit Ethernet"
+0x14e4	0x1658	"tg3_ng"	"Broadcom Corp.|"
+0x14e4	0x1659	"tg3_ng"	"Broadcom Corp.|NetXtreme BCM5721 Gigabit Ethernet PCI Express"
+0x14e4	0x165d	"bcm5700"	"Broadcom Corp.|BCM5705M 1000BaseTX"
+0x14e4	0x165e	"bcm5700"	"Broadcom Corp.|BCM5705M-2 1000BaseTX"
+0x14e4	0x166d	"unknown"	"Broadcom Corp.| "
+0x14e4	0x166e	"tg3"	"Broadcom Corp.|BCM5705F 1000BaseTX"
+0x14e4	0x1676	"tg3_ng"	"Broadcom Corp.|"
+0x14e4	0x1677	"bcm5700"	"Broadcom Corp.|NetXtreme BCM5751 Gigabit Ethernet PCI Express"
+0x14e4	0x167c	"tg3_ng"	"Broadcom Corp.|"
+0x14e4	0x167d	"tg3_ng"	"Broadcom Corp.|"
+0x14e4	0x167e	"tg3_ng"	"Broadcom Corp.|"
+0x14e4	0x1696	"tg3"	"Broadcom Corp.|NetXtreme BCM5782 Gigabit Ethernet"
+0x14e4	0x169c	"bcm5700"	"Broadcom Corp.|NetXtreme BCM5788 Gigabit Ethernet"
+0x14e4	0x169d	"tg3_ng"	"Broadcom Corp.|"
+0x14e4	0x16a6	"tg3"	"Broadcom Corp.|NetXtreme BCM5702X Gigabit Ethernet"
+0x14e4	0x16a7	"tg3"	"Broadcom Corp.|NetXtreme BCM5703X Gigabit Ethernet"
+0x14e4	0x16a8	"bcm5700"	"Broadcom Corp.|NetXtreme BCM5704X Gigabit Ethernet"
+0x14e4	0x16aa	"unknown"	"Broadcom Corporation|NetXtreme II BCM5706S Gigabit Ethernet"
+0x14e4	0x16c6	"tg3"	"Broadcom Corp.|NetXtreme BCM5702 Gigabit Ethernet"
+0x14e4	0x16c7	"tg3"	"Broadcom Corp.|NetXtreme BCM5703 Gigabit Ethernet"
+0x14e4	0x170c	"bcm4400"	"Broadcom Corp.|BCM4401-B0 100Base-TX"
+0x14e4	0x170d	"bcm5700"	"Broadcom Corp.|NetXtreme BCM5700 Ethernet"
+0x14e4	0x170e	"bcm5700"	"Broadcom Corp.|NetXtreme BCM5700 Ethernet"
+0x14e4	0x3352	"unknown"	"Broadcom Corp.|BCM3352"
+0x14e4	0x3360	"unknown"	"Broadcom Corp.|BCM3360"
+0x14e4	0x4210	"unknown"	"Broadcom Corp.|BCM4210 iLine10 HomePNA 2.0"
+0x14e4	0x4211	"unknown"	"Broadcom Corp.|BCM HPNA 10Mb/s NIC"
+0x14e4	0x4212	"unknown"	"Broadcom Corp.|BCM V.90 56k Modem"
+0x14e4	0x4301	"unknown"	"Broadcom Corp.|BCM4301 802.11b"
+0x14e4	0x4305	"unknown"	"Broadcom Corporation|BCM4307 V.90 56k Modem"
+0x14e4	0x4306	"unknown"	"Broadcom Corporation|BCM4307 Ethernet Controller"
+0x14e4	0x4307	"unknown"	"Broadcom Corp.|BCM4307 802.11b Wireless LAN Controller"
+0x14e4	0x4310	"unknown"	"Broadcom Corporation|BCM4310 Chipcommon I/OController"
+0x14e4	0x4312	"unknown"	"Broadcom Corporation|BCM4310 UART"
+0x14e4	0x4313	"unknown"	"Broadcom Corporation|BCM4310 Ethernet Controller"
+0x14e4	0x4315	"unknown"	"Broadcom Corporation|BCM4310 USB Controller"
+0x14e4	0x4320	"unknown"	"Broadcom Corp.|BCM94306 802.11g NIC"
+0x14e4	0x4321	"unknown"	"Broadcom Corporation|BCM4306 802.11a Wireless LAN Controller"
+0x14e4	0x4322	"unknown"	"Broadcom Corporation|BCM4306 UART"
+0x14e4	0x4324	"unknown"	"Broadcom Corp.|BCM4309 802.11a/b/g"
+0x14e4	0x4325	"unknown"	"Broadcom Corporation|BCM43xG 802.11b/g"
+0x14e4	0x4326	"unknown"	"Broadcom Corporation|BCM4307 Chipcommon I/O Controller?"
+0x14e4	0x4401	"bcm4400"	"Broadcom Corp.|BCM4401 100Base-T"
+0x14e4	0x4402	"bcm4400"	"Broadcom Corp.|BCM4402 Integrated 10/100BaseT"
+0x14e4	0x4403	"unknown"	"Broadcom Corp.|BCM4402 V.90 56k Modem"
+0x14e4	0x4410	"unknown"	"Broadcom Corp.|BCM4413 iLine32 HomePNA 2.0"
+0x14e4	0x4411	"unknown"	"Broadcom Corp.|BCM4413 V.90 56k modem"
+0x14e4	0x4412	"unknown"	"Broadcom Corp.|BCM4413 10/100BaseT"
+0x14e4	0x4430	"unknown"	"Broadcom Corp.|BCM44xx CardBus iLine32 HomePNA 2.0"
+0x14e4	0x4432	"unknown"	"Broadcom Corp.|BCM44xx CardBus 10/100BaseT"
+0x14e4	0x4610	"unknown"	"Broadcom Corp.|BCM4610 Sentry5 PCI to SB Bridge"
+0x14e4	0x4611	"unknown"	"Broadcom Corp.|BCM4610 Sentry5 iLine32 HomePNA 1.0"
+0x14e4	0x4612	"unknown"	"Broadcom Corp.|BCM4610 Sentry5 V.90 56k Modem"
+0x14e4	0x4613	"unknown"	"Broadcom Corp.|BCM4610 Sentry5 Ethernet Controller"
+0x14e4	0x4614	"unknown"	"Broadcom Corp.|BCM4610 Sentry5 External Interface"
+0x14e4	0x4615	"unknown"	"Broadcom Corp.|BCM4610 Sentry5 USB Controller"
+0x14e4	0x4704	"unknown"	"Broadcom Corp.|BCM4704 PCI to SB Bridge"
+0x14e4	0x4705	"unknown"	"Broadcom Corporation|BCM4704 Sentry5 802.11b Wireless LAN Controller"
+0x14e4	0x4706	"unknown"	"Broadcom Corporation|BCM4704 Sentry5 Ethernet Controller"
+0x14e4	0x4707	"unknown"	"Broadcom Corporation|BCM4704 Sentry5 USB Controller"
+0x14e4	0x4708	"unknown"	"Broadcom Corp.|BCM4708 Sentry5 PCI to SB Bridge"
+0x14e4	0x4710	"unknown"	"Broadcom Corp.|BCM4710 Sentry5 PCI to SB Bridge"
+0x14e4	0x4711	"unknown"	"Broadcom Corp.|BCM47xx Sentry5 iLine32 HomePNA 2.0"
+0x14e4	0x4712	"unknown"	"Broadcom Corp.|Sentry5 UART"
+0x14e4	0x4713	"b44"	"Broadcom Corp.|Sentry5 Ethernet Controller"
+0x14e4	0x4714	"unknown"	"Broadcom Corp.|BCM47xx Sentry5 External Interface"
+0x14e4	0x4715	"unknown"	"Broadcom Corp.|Sentry5 USB Controller"
+0x14e4	0x4716	"unknown"	"Broadcom Corp.|BCM47xx Sentry5 USB Host Controller"
+0x14e4	0x4717	"unknown"	"Broadcom Corp.|BCM47xx Sentry5 USB Device Controller"
+0x14e4	0x4718	"unknown"	"Broadcom Corp.|Sentry5 Crypto Accelerator"
+0x14e4	0x4720	"unknown"	"Broadcom Corporation|BCM4712 MIPS CPU"
+0x14e4	0x5365	"unknown"	"Broadcom Corp.|BCM5365P Sentry5 Host Bridge"
+0x14e4	0x5600	"unknown"	"Broadcom Corp.|BCM5600 StrataSwitch 24+2 Ethernet Switch Controller"
+0x14e4	0x5605	"unknown"	"Broadcom Corp.|BCM5605 StrataSwitch 24+2 Ethernet Switch Controller"
+0x14e4	0x5615	"unknown"	"Broadcom Corp.|BCM5615 StrataSwitch 24+2 Ethernet Switch Controller"
+0x14e4	0x5625	"unknown"	"Broadcom Corp.|BCM5625 StrataSwitch 24+2 Ethernet Switch Controller"
+0x14e4	0x5645	"unknown"	"Broadcom Corp.|BCM5645 StrataSwitch 24+2 Ethernet Switch Controller"
+0x14e4	0x5670	"unknown"	"Broadcom Corp.|BCM5670 8-Port 10GE Ethernet Switch Fabric"
+0x14e4	0x5680	"unknown"	"Broadcom Corp.|BCM5680 G-Switch 8 Port Gigabit Ethernet Switch Controller"
+0x14e4	0x5690	"unknown"	"Broadcom Corp.| "
+0x14e4	0x5691	"unknown"	"Broadcom Corp.|BCM5691 GE/10GE 8+2 Gigabit Ethernet Switch Controller"
+0x14e4	0x5802	"unknown"	"Broadcom Corp.|BCM5802 The BCM5802 Security Processor integrates Broadcom’s IPSec engine (DES, 3DES, HMAC-SHA-1, HMAC-MD5),"
+0x14e4	0x5805	"unknown"	"Broadcom Corp.|BCM5805 The BCM5805 Security Processor integrates a high-performance IPSec engine (DES, 3DES, HMAC-SHA-1, HM"
+0x14e4	0x5820	"bcm5820"	"Broadcom Corp.|BCM5820 Crypto Accelerator"
+0x14e4	0x5821	"bcm5820"	"Broadcom Corp.|BCM5821 Crypto Accelerator"
+0x14e4	0x5822	"unknown"	"Broadcom Corp.|BCM5822 Crypto Accelerator"
+0x14e4	0x5823	"unknown"	"Broadcom Corp.|BCM5823 Crypto Accelerator"
+0x14e4	0x5824	"unknown"	"Broadcom Corp.|BCM5824 Crypto Accelerator"
+0x14e4	0x5840	"unknown"	"Broadcom Corp.|BCM5840 Crypto Accelerator"
+0x14e4	0x5841	"unknown"	"Broadcom Corp.|BCM5841 Crypto Accelerator"
+0x14e4	0x5850	"unknown"	"Broadcom Corp.|BCM5850 Crypto Accelerator"
 0x14ea	0xab06	"8139too"	"Planex Communications, Inc|FNW-3603-TX CardBus Fast Ethernet"
-0x14ea	0xab07	"8139too"	""
-0x14eb	0x0020	"unknown"	"Epson Corporation|BEMx.x PCI to S5U13xxxB00B Bridge Adapter"
-0x14eb	0x0c01	"unknown"	"Seiko Epson Corporation|S1D13808 Embedded Memory Display Controller"
+0x14ea	0xab07	"8139too"	"Planex Communications, Inc|RTL81xx RealTek Ethernet"
+0x14eb	0x0020	"unknown"	"Epson Corp.|BEMx.x PCI to S5U13xxxB00B Bridge Adapter"
+0x14eb	0x0c01	"unknown"	"Seiko Epson Corp.|S1D13808 Embedded Memory Display Controller"
 0x14f1	0x0854	"Hcf:www.linmodems.org"	"Conexant Systems, Inc.|RLVDL56DPF K56 FLEX, V.90, HCF controller"
 0x14f1	0x1002	"Hcf:www.linmodems.org"	"Conexant Systems, Inc.|3251 HCF 56k Modem"
 0x14f1	0x1003	"Hcf:www.linmodems.org"	"Conexant Systems, Inc.|HCF 56k Modem"
@@ -4149,6 +4618,7 @@
 0x14f2	0x0122	"unknown"	"Mobility Electronics, Inc.|PCI Serial Port"
 0x14f2	0x0123	"pcips2"	"Mobility Electronics, Inc.|PCI PS/2 Keyboard Port"
 0x14f2	0x0124	"pcips2"	"Mobility Electronics, Inc.|PCI PS/2 Mouse Port"
+0x14f3	0x2030	"unknown"	"BroadLogic|2030 Satellite Reciever"
 0x14fc	0x0000	"unknown"	"Quadrics Ltd|QsNet Elan3 Network Adapter"
 0x14fc	0x0001	"unknown"	"Quadrics Ltd|QsNetII Elan4 Network Adapter"
 0x1500	0x1300	"unknown"	"DELTA Electronics, Inc.|SIS900 10/100M PCI Fast Ethernet Controller"
@@ -4173,14 +4643,18 @@
 0x151f	0x0000	"unknown"	"TOPIC SEMICONDUCTOR Corp|TP560 Data/Fax/Voice 56k modem"
 0x1522	0x0100	"unknown"	"Mainpine Limited|PBridge+ PCI Interface Chip"
 0x1524	0x0510	"unknown"	"ENE Technology Inc|CB710 Cardbus Controller (4 in 1 reader)"
-0x1524	0x1211	"unknown"	"ENE Technology Inc|CB1211 Cardbus Controller"
-0x1524	0x1225	"unknown"	"ENE Technology Inc|CB1225 Cardbus Controller"
-0x1524	0x1410	"unknown"	"ENE Technology Inc|Unknown CardBus bridge"
+0x1524	0x0610	"unknown"	"ENE Technology Inc|PCI Smart Card Reader Controller"
+0x1524	0x1211	"yenta_socket"	"ENE Technology Inc|CB1211 Cardbus Controller"
+0x1524	0x1225	"yenta_socket"	"ENE Technology Inc|CB1225 Cardbus Controller"
+0x1524	0x1410	"yenta_socket"	"ENE Technology Inc|CB1410 CardBus Controller"
 0x1524	0x1411	"yenta_socket"	"ENE Technology Inc|CB1411 CardBus Controller"
-0x1524	0x1420	"unknown"	"ENE Technology Inc|CB1420 Cardbus Controller"
+0x1524	0x1412	"unknown"	"ENE Technology Inc|CB-712/4 Cardbus Controller"
+0x1524	0x1420	"yenta_socket"	"ENE Technology Inc|CB1420 Cardbus Controller"
 0x1524	0x1421	"unknown"	"ENE Technology Inc|CB720 Cardbus Controller"
+0x1524	0x1422	"unknown"	"ENE Technology Inc|CB-722/4 Cardbus Controller"
 0x1538	0x0303	"unknown"	"ARALION Inc|ARS106S Ultra ATA 133/100/66 Host Controller"
 0x153b	0x1144	"unknown"	"TERRATEC Electronic GmbH|Aureon 5.1"
+0x153b	0x1158	"unknown"	"TERRATEC Electronic GmbH|Philips Semiconductors SAA7134 (rev 01) [Terratec Cinergy 600 TV]"
 0x153b	0x6003	"unknown"	"Terratec Electronic GMBH|CS4614/22/24 CrystalClear SoundFusion PCI Audio Accel"
 0x1543	0x3052	"unknown"	"SILICON Laboratories|Intel 537 [Winmodem]"
 0x1543	0x4c22	"unknown"	"SILICON Laboratories|Si3036 MC'97 DAA"
@@ -4219,14 +4693,22 @@
 0x1592	0x0788	"unknown"	"Syba Tech Ltd|Multi-IO Card"
 0x1592	0x078a	"unknown"	"Syba Tech Ltd|Multi-IO Card"
 0x15a2	0x0001	"unknown"	"Catalyst Enterprises Inc|TA700 PCI Bus Analyzer/Exerciser"
+0x15aa	0x2000	"8250_pci"	""
 0x15ad	0x0405	"Card:VMware virtual video card"	"VMWare|PCI SVGA (FIFO)"
 0x15ad	0x0710	"Card:VMware virtual video card"	"VMWare|Virtual SVGA"
+0x15ad	0x0720	"unknown"	"VMware Inc|VMware High-Speed Virtual NIC [vmxnet]"
 0x15b0	0x0001	"unknown"	"Zoltrix|FM-1789 Pctel"
 0x15b0	0x2bd0	"ISDN:hisax,type=35"	"Zoltrix|2BD0 ISDN Adapter"
+0x15b3	0x15b3	"unknown"	"Mellanox Technology|Mellanox Technologies"
 0x15b3	0x5274	"unknown"	"Mellanox Technology|MT21108 InfiniBridge"
 0x15b3	0x5a44	"unknown"	"Mellanox Technology|MT23108 InfiniHost"
 0x15b3	0x5a45	"unknown"	"Mellanox Technology|MT23108 InfiniHost (Tavor)"
 0x15b3	0x5a46	"unknown"	"Mellanox Technology|MT23108 PCI Bridge"
+0x15b3	0x5e8c	"unknown"	"Mellanox Technology|MT24204 [InfiniHost III Lx HCA]"
+0x15b3	0x5e8d	"unknown"	"Mellanox Technology|MT24204 [InfiniHost III Lx HCA Flash Recovery]"
+0x15b3	0x6278	"unknown"	"Mellanox Technology|MT25208 InfiniHost III Ex (Tavor compatibility mode)"
+0x15b3	0x6279	"unknown"	"Mellanox Technology|MT25208 [InfiniHost III Ex HCA Flash Recovery]"
+0x15b3	0x6282	"unknown"	"Mellanox Technology|MT25208 InfiniHost III Ex"
 0x15bc	0x0101	"unknown"	"Agilent Technologies|n2530a DX2+ FC-AL Adapter"
 0x15bc	0x2530	"unknown"	"Agilent Technologies|??? HP Communications Port"
 0x15bc	0x2531	"unknown"	"Agilent Technologies|??? HP Toptools Remote Control Adapter"
@@ -4253,12 +4735,12 @@
 0x15f2	0x0003	"unknown"	"Diagnostic Instruments Inc|Spot Insight Spot Insight Interface Board"
 0x1619	0x0400	"farsync"	"FarSite Communications Limited|FarSync T2P two Port Intelligent Sync Comms Card"
 0x1619	0x0440	"farsync"	"FarSite Communications Limited|FarSync T4P Four Port Intelligent Sync Comms Card"
-0x1619	0x0610	"unknown"	"FarSite Communications Limited|FarSync T1U One Port Intelligent Sync Comms Card"
-0x1619	0x0620	"unknown"	"FarSite Communications Limited|FarSync T2U Two Port Intelligent Sync Comms Card"
-0x1619	0x0640	"unknown"	"FarSite Communications Limited|FarSync T4U Four Port Intelligent Sync Comms Card"
-0x1619	0x1610	"unknown"	"FarSite Communications Limited|FarSync TE1 One Port Intelligent Sync Comms Card"
-0x1619	0x1612	"unknown"	"FarSite Communications Limited|FarSync TE1C Channelized Intelligent Sync Comms Card"
-0x1626	0x8410	"tulip"	""
+0x1619	0x0610	"farsync"	"FarSite Communications Limited|FarSync T1U One Port Intelligent Sync Comms Card"
+0x1619	0x0620	"farsync"	"FarSite Communications Limited|FarSync T2U Two Port Intelligent Sync Comms Card"
+0x1619	0x0640	"farsync"	"FarSite Communications Limited|FarSync T4U Four Port Intelligent Sync Comms Card"
+0x1619	0x1610	"farsync"	"FarSite Communications Limited|FarSync TE1 One Port Intelligent Sync Comms Card"
+0x1619	0x1612	"farsync"	"FarSite Communications Limited|FarSync TE1C Channelized Intelligent Sync Comms Card"
+0x1626	0x8410	"tulip"	"TDK Semiconductor Corp.|RTL81xx Fast Ethernet"
 0x1629	0x1003	"unknown"	"Kongsberg Spacetec AS|Format synchronizer v3.0"
 0x1629	0x2002	"unknown"	"Kongsberg Spacetec AS|Fast Universal Data Output"
 0x162d	0x0100	"unknown"	"Reprosoft Co Ltd|Repeographics controller"
@@ -4267,16 +4749,20 @@
 0x162d	0x0103	"unknown"	"Reprosoft Co Ltd|Reprographics Controller"
 0x162f	0x1111	"unknown"	"Rohde & Schwarz GMBH & Co KG|TS-PRL1 General Purpose Relay Card"
 0x162f	0x1112	"unknown"	"Rohde & Schwarz GMBH & Co KG|TS-PMA Matrix Card"
-0x1638	0x1100	"orinoco_plx"	""
-0x163c	0x3052	"unknown"	"Smart Link Ltd.|SmartLink SmartPCI562 56K Modem"
+0x1637	0x3874	"unknown"	"Linksys|Linksys 802.11b WMP11 PCI Wireless card"
+0x1638	0x1100	"orinoco_plx"	"Standard Microsystems Corp [SMC]|SMC2602W EZConnect / Addtron AWA-100 / Eumitcom PCI WL11000"
+0x163c	0x3052	"slamr"	"Smart Link Ltd.|SmartLink SmartPCI562 56K Modem"
 0x163c	0x5449	"unknown"	"Smart Link Ltd.|SmartPCI561 Modem"
+0x163c	0x5459	"slamr"	"Smart Link Ltd.|Modem"
 0x163c	0xff02	"unknown"	"Smart Link|Aztech CNR V.92 Modem"
 0x165a	0xc100	"unknown"	"Epix Inc|PIXCI(R) CL1 Camera Link Video Capture Board [custom QL5232]"
 0x165a	0xd200	"unknown"	"Epix Inc|PIXCI(R) D2X Digital Video Capture Board [custom QL5232]"
 0x165a	0xd300	"unknown"	"Epix Inc|PIXCI(R) D3X Digital Video Capture Board [custom QL5232]"
 0x1668	0x0100	"unknown"	"Actiontec Electronics Inc.|PCI to PCI Bridge"
 0x166d	0x0001	"unknown"	"Sibyte Inc.| "
-0x166d	0x0002	"unknown"	"Broadcom Corporation|SiByte BCM1125H/1250 System-on-a-Chip HyperTransport"
+0x166d	0x0002	"unknown"	"Broadcom Corp.|SiByte BCM1125H/1250 System-on-a-Chip HyperTransport"
+0x1677	0x104e	"unknown"	"Bernecker + Rainer|5LS172.6 B&R Dual CAN Interface Card"
+0x1677	0x12d7	"unknown"	"Bernecker + Rainer|5LS172.61 B&R Dual CAN Interface Card"
 0x167d	0xa000	"hostap_pci"	""
 0x167f	0x4634	"unknown"	"Ingenieurbuero Anhaus GmbH|FOB-IO Card"
 0x167f	0x4c32	"unknown"	"Ingenieurbuero Anhaus GmbH|L2B PCI Board"
@@ -4292,33 +4778,38 @@
 0x1688	0x1170	"unknown"	"CastleNet Technology Inc.|WLAN 802.11b card"
 0x168c	0x0007	"vt_ar5k"	"Atheros Communications Inc.|802.11a Wireless Adapter"
 0x168c	0x0011	"unknown"	"Atheros Communications Inc.|AR5210 802.11a Wireless Adapter"
-0x168c	0x0012	"unknown"	"Atheros Communications Inc.|AR5211 802.11a/b/g Mini-PCI Wireless Adapter"
-0x168c	0x0013	"unknown"	"Atheros Communications Inc.|AR5213 802.11a/b/g Wireless Adapter"
-0x168c	0x0107	"vt_ar5k"	""
-0x168c	0x1014	"unknown"	"Atheros Communications, Inc.|AR5212 802.11abg NIC"
+0x168c	0x0012	"ath_pci"	"Atheros Communications Inc.|AR5211 802.11a/b/g Mini-PCI Wireless Adapter"
+0x168c	0x0013	"ath_pci"	"Atheros Communications Inc.|AR5213 802.11a/b/g Wireless Adapter"
+0x168c	0x0107	"vt_ar5k"	"Atheros Communications Inc.|"
+0x168c	0x1014	"ath_pci"	"Atheros Communications, Inc.|AR5212 802.11abg NIC"
 0x1693	0x0212	"unknown"	"FERMA|PLX PCI9054 EPONINE ESR-PCI Board"
 0x1693	0x0213	"unknown"	"FERMA|Motorola MPC8245 EPONINE MTM120 PCI Board"
 0x16ab	0x1100	"orinoco_plx"	"Global Sun Tech|GL24110P"
 0x16ab	0x1101	"orinoco_plx"	"Unknown|Prism2"
 0x16ab	0x1102	"orinoco_plx"	"Linksys|WDT11"
-0x16ab	0x1103	"hostap_plx"	""
+0x16ab	0x1103	"hostap_plx"	"Linksys|"
 0x16ae	0x1141	"unknown"	"SafeNet Inc.|SafeXcel-1141 ???"
 0x16ca	0x0001	"unknown"	"Cenatek Inc.|Rocket Drive Solid State Disk"
+0x16e3	0x1e0f	"unknown"	"European Space Agency|LEON2FT Processor"
 0x16ec	0x00ff	"unknown"	"U.S. Robotics|USR997900 10/100 Mbps PCI Network Card"
 0x16ec	0x3685	"orinoco_plx"	"U.S. Robotics|Wireless Access PCI Adapter Model 022415"
+0x16f4	0x8000	"unknown"	"Vweb Corp|VW2010"
 0x170b	0x0100	"unknown"	"NetOctave Inc.|NSP2000-SSL Crypto Aceletator"
+0x1725	0x7174	"sata_vsc"	"Vitesse Semiconductor|VSC7174 PCI/PCI-X Serial ATA Host Bus Controller"
 0x1734	0x007a	"unknown"	"Fujitsu-Siemens Computers GmbH|Rage XL ATI Rage XL (rev 27)"
 0x1734	0x1011	"unknown"	"Fujitsu-Siemens Computers GmbH|AIC-7902W Adaptec AIC-7902 Dual Channel U320 SCSI"
 0x1734	0x1012	"unknown"	"Fujitsu-Siemens Computers GmbH|CSB6 Serverworks Southbridge with RAID/IDE (rev a0), OHCI USB (rev 05), GCLE-2 Host Bridge"
 0x1734	0x1013	"unknown"	"Fujitsu-Siemens Computers GmbH|BCM5703 Broadcom Corp. NetXtreme Gigabyte Ethernet"
+0x1737	0x0013	"unknown"	"Linksys|WMP54G Wireless Pci Card"
+0x1737	0x0015	"unknown"	"Linksys|WMP54GS Wireless Pci Card"
 0x1737	0x1032	"unknown"	"Linksys|Gigabit Network Adapter"
 0x1737	0x1064	"unknown"	"Linksys|Gigabit Network Adapter"
-0x1737	0xab08	"tulip"	""
-0x1737	0xab09	"tulip"	""
+0x1737	0xab08	"tulip"	"Linksys|21x4x DEC-Tulip compatible 10/100 Ethernet"
+0x1737	0xab09	"tulip"	"Linksys|21x4x DEC-Tulip compatible 10/100 Ethernet"
 0x173b	0x03e8	"tg3"	"Altima (nee BroadCom)|AC1000 Gigabit Ethernet"
 0x173b	0x03e9	"tg3"	"Altima (nee BroadCom)|AC1000 Gigabit Ethernet"
 0x173b	0x03ea	"tg3"	"Altima (nee BroadCom)|AC1000 Gigabit Ethernet"
-0x173b	0x03eb	"tg3"	""
+0x173b	0x03eb	"tg3"	"Altima (nee BroadCom)|AC1000 Gigabit Ethernet"
 0x1743	0x8139	"8139too"	"Peppercon AG|ROL/F-100 Fast Ethernet Adapter with ROL"
 0x1755	0x0000	"unknown"	"Alchemy Semiconductor Inc.| "
 0x1796	0x0001	"unknown"	"Research Centre Juelich|SIS1100 [Gigabit link]"
@@ -4330,20 +4821,27 @@
 0x1799	0x6001	"unknown"	"Belkin|Wireless PCI Card - F5D6001"
 0x1799	0x6020	"unknown"	"Belkin|Wireless PCMCIA Card - F5D6020"
 0x1799	0x6060	"unknown"	"Belkin|Wireless PDA Card - F5D6060"
-0x17b3	0xab08	"tulip"	""
+0x1799	0x7000	"unknown"	"Belkin|Wireless PCI Card - F5D7000"
+0x17b3	0xab08	"tulip"	"Hawking Technologies|PN672TX 10/100 Ethernet"
 0x17b4	0x0011	"unknown"	"Indra Networks, Inc.|WebEnhance 100 GZIP Compression Card"
 0x17c0	0x12ab	"unknown"	"Wistron Corp.| "
 0x17cc	0x2280	"net2280"	"NetChip Technology, Inc|USB 2.0"
+0x17fe	0x2220	"unknown"	"Linksys, A Division of Cisco Systems|[AirConn] INPROCOMM IPN 2220 Wireless LAN Adapter (rev 01)"
 0x1813	0x4000	"Bad:www.linmodems.org"	"Modem Silicon Operation|MD563X Host Accelerated Modem"
 0x1813	0x4100	"unknown"	"Ambient Technologies Inc|HaM plus Data Fax Modem"
 0x1814	0x0101	"unknown"	"RaLink|Wireless PCI Adpator RT2400 / RT2460"
-0x1814	0x0201	"unknown"	"RaLink|Ralink RT2500 802.11 Cardbus Reference Card"
+0x1814	0x0201	"rt2500"	"RaLink|Ralink RT2500 802.11 Cardbus Reference Card"
+0x183b	0x08a7	"unknown"	"MikroM GmbH|MVC100 DVI"
+0x183b	0x08a8	"unknown"	"MikroM GmbH|MVC101 SDI"
+0x183b	0x08a9	"unknown"	"MikroM GmbH|MVC102 DVI+Audio"
 0x1850	0x1851	"bttv"	"Flyvideo 98 (LR50) / Chronos Video Shuttle II"
 0x1851	0x1851	"bttv"	"Flyvideo 98EZ (LR51) / CyberMail AV"
 0x1852	0x1852	"bttv"	"Flyvideo 98FM (LR50) / Typhoon TView TV/FM Tuner"
 0x1867	0x5a44	"unknown"	"Topspin Communications|MT23108 PCI-X HCA"
 0x1867	0x5a45	"unknown"	"Topspin Communications|MT23108 PCI-X HCA flash recovery"
 0x1867	0x5a46	"unknown"	"Topspin Communications|MT23108 PCI-X HCA bridge"
+0x1867	0x6278	"unknown"	"Topspin Communications|MT25208 InfiniHost III Ex (Tavor compatibility mode)"
+0x1867	0x6282	"unknown"	"Topspin Communications|MT25208 InfiniHost III Ex"
 0x1888	0x0301	"unknown"	"Varisys Ltd|VMFX1 FPGA PMC module"
 0x1888	0x0601	"unknown"	"Varisys Ltd|VSM2 dual PMC carrier"
 0x1888	0x0710	"unknown"	"Varisys Ltd|VS14x series PowerPC PCI board"
@@ -4353,6 +4851,7 @@
 0x1888	0x3503	"unknown"	"1 Prolink Computer Inc.|nVidia NV28 VGA Geforce4 MX440"
 0x1888	0x3505	"unknown"	"1 Prolink Computer Inc.|nVidia NV28 VGA Geforce4 Ti4200"
 0x1898	0x2001	"unknown"	"DIC INFORMATION TECHNOLOGY ,LTD|DVB Receiver Card"
+0x18ac	0xd810	"unknown"	"DViCO Corporation|FusionHDTV 3 Gold"
 0x18ca	0x0040	"unknown"	"XGI - Xabre Graphics Inc|Volari V8"
 0x18e6	0x0001	"unknown"	"MPL AG|OSCI [Octal Serial Communication Interface]"
 0x1a08	0x0000	"unknown"	"Sierra semiconductor|SC15064"
@@ -4361,12 +4860,14 @@
 0x1de1	0x0391	"dc395x_trm"	"Tekram|TRM-S1040"
 0x1de1	0x2020	"unknown"	"Tekram|DC-390"
 0x1de1	0x690c	"unknown"	"Tekram|690c"
-0x1de1	0xdc29	"unknown"	"Tekram|DC290"
+0x1de1	0xdc29	"trm290"	"Tekram|DC290"
 0x1de2	0x1190	"unknown"	"A/DHOC Systèmes|001 Slave PCI protyting board"
 0x1dea	0x0001	"unknown"	"Lasentec|701-1350 Lasentec FBRM Counter"
 0x1dea	0x0002	"unknown"	"Lasentec|701-1429 Lasentec PVM Controller"
 0x1fc0	0x0300	"unknown"	"Tumsan Oy|E2200 Dual E1/Rawpipe Card"
+0x2000	0x2800	"slamr"	"Smart Link Ltd.|Modem"
 0x2002	0x2003	"unknown"	"Automation Technology GmbH|0x2003 PCI Frame Grabber"
+0x2003	0x8800	"slamr"	"Smart Link Ltd.|Modem"
 0x2014	0x0004	"unknown"	"NONTECH Nonnenmacher GmbH|aa551234 PCI Master Target"
 0x2014	0x0040	"unknown"	"NONTECH Nonnenmacher GmbH|0xff8000 PCI to Private Bus Bridge for Primary Ra"
 0x217d	0x6606	"bttv"	"Leadtek|WinFast TV 2000"
@@ -4382,6 +4883,7 @@
 0x3388	0x0014	"unknown"	"Hint Corp|HiNT HC4 PCI to ISDN bridge, Network controller"
 0x3388	0x0020	"unknown"	"Hint Corp.|HB6 UNIVERSAL PCI-PCI BRIDGE"
 0x3388	0x0021	"unknown"	"Hint Corp|HB1-SE33 PCI-PCI Bridge"
+0x3388	0x0022	"unknown"	"Hint Corp|HiNT HB4 PCI-PCI Bridge (PCI6150)"
 0x3388	0x0026	"unknown"	"Hint Corp|HB2 PCI-PCI Bridge"
 0x3388	0x101a	"unknown"	"Hint Corp|E.Band [AudioTrak Inca88]"
 0x3388	0x101b	"unknown"	"Hint Corp|E.Band [AudioTrak Inca88]"
@@ -4411,6 +4913,7 @@
 0x3d3d	0x0024	"unknown"	"3DLabs|VP9 visual processor"
 0x3d3d	0x0100	"Card:3Dlabs Permedia2 (generic)"	"3DLabs|Permedia II 2D+3D"
 0x3d3d	0x07a1	"unknown"	"3DLabs|Wildcat III 6210"
+0x3d3d	0x07a2	"unknown"	"3DLabs|Sun XVR-500 Graphics Accelerator"
 0x3d3d	0x07a3	"unknown"	"3DLabs|Wildcat IV 7210"
 0x3d3d	0x1004	"Card:Elsa GLoria-S"	"3DLabs|Permedia"
 0x3d3d	0x3d04	"Card:Elsa GLoria-S"	"3DLabs|Permedia"
@@ -4448,7 +4951,8 @@
 0x4500	0x0070	"bttv"	"Hauppauge|WinTV/PVR"
 0x4550	0x9054	"unknown"	"Tucker-Davis Technologies|PLX9054"
 0x4916	0x1960	"rcpci"	"RedCreek Communications Inc|RedCreek PCI adapter"
-0x494f	0x22c0	"wdt_pci"	""
+0x494f	0x10e8	"unknown"	"ACCES I/O Products, Inc.|LPCI-COM-8SM"
+0x494f	0x22c0	"wdt_pci"	"ICS Advent|"
 0x494f	0xaca8	"unknown"	"ICS Advent|PCI-AI/1216 ADC Card"
 0x494f	0xaca9	"unknown"	"ICS Advent|PCI-AI/1216(M) ADC Card"
 0x4a14	0x5000	"ne2k-pci"	"NetVin|NV5000SC"
@@ -4477,7 +4981,7 @@
 0x4ddc	0x0b03	"unknown"	"ILC Data Device Corp|BU-65569I3 MIL-STD-1553 Data Bus"
 0x4ddc	0x0b04	"unknown"	"ILC Data Device Corp|BU-65569I4 MIL-STD-1553 Data Bus"
 0x5018	0x153b	"bttv"	"Terratec|TValue"
-0x5046	0x1001	"radio-maxiradio"	""
+0x5046	0x1001	"radio-maxiradio"	"GemTek Technology Corp.|PCI Radio"
 0x5053	0x2010	"unknown"	"Voyetra Technologies|Daytona Audio Adapter"
 0x5112	0x0001	"unknown"	"Sigmatek GmbH & CoKG|DCP401 Intelligent Dias Master"
 0x5145	0x3031	"unknown"	"Ensoniq (Old)|Concert AudioPCI"
@@ -4570,7 +5074,8 @@
 0x5455	0x4458	"unknown"	"Technische University Berlin|S5933"
 0x5544	0x0001	"unknown"	"Dunord Technologies|I-30xx Scanner Interface"
 0x5555	0x0003	"unknown"	"Genroco, Inc|TURBOstor HFP-832 [HiPPI NIC]"
-0x55cf	0x2111	"unknown"	"Unisys Corporation|UNISYS CP150P"
+0x55cf	0x2111	"unknown"	"Unisys Corp.|UNISYS CP150P"
+0x5654	0x3132	"unknown"	"VoiceTronix Pty Ltd|OpenSwitch12"
 0x6356	0x4002	"unknown"	"UltraStor|ULTRA24 SCSI Host"
 0x6356	0x4102	"unknown"	"UltraStor|ULTRA24 SCSI Host"
 0x6356	0x4202	"unknown"	"UltraStor|ULTRA24 SCSI Host"
@@ -4590,9 +5095,9 @@
 0x6374	0x6773	"unknown"	"c't Magazin|GPPCI"
 0x6606	0x107d	"bttv"	"Leadtek WinFast TV 2000"
 0x6606	0x217d	"bttv"	"Leadtek|WinFast TV 2000"
-0x6666	0x0001	"unknown"	"Decision Computer|PCCOM4"
-0x6666	0x0002	"unknown"	"Decision Computer|PCCOM8"
-0x764d	0x1022	"snd-intel8x0"	"Intel Corporation|AMD-8111 810 Chipset AC'97 Audio Controller"
+0x6666	0x0001	"8250_pci"	"Decision Computer|PCCOM4"
+0x6666	0x0002	"8250_pci"	"Decision Computer|PCCOM8"
+0x764d	0x1022	"snd-intel8x0"	"Intel Corp.|AMD-8111 810 Chipset AC'97 Audio Controller"
 0x8001	0x0010	"unknown"	"Beyertone AG - Germany|ispLSI1032E PCI-decoder"
 0x8008	0x0010	"unknown"	"Quancom Electronic GmbH|WDOG1 [PCI-Watchdog 1]"
 0x8008	0x0011	"unknown"	"Quancom Electronic GmbH|PWDOG2 [PCI-Watchdog 2]"
@@ -4609,14 +5114,14 @@
 0x8008	0x1005	"unknown"	"QUANCOM Informationssysteme GmbH|PAD12"
 0x8008	0x1006	"unknown"	"QUANCOM Informationssysteme GmbH|PAD16"
 0x8008	0x3000	"unknown"	"QUANCOM Informationssysteme GmbH|POPTOLCA"
-0x8086	0x0007	"unknown"	"Intel Corporation|82379AB"
+0x8086	0x0007	"unknown"	"Intel Corp.|82379AB"
 0x8086	0x0008	"unknown"	"Intel|Extended Express System Support Controller"
-0x8086	0x0039	"tulip"	"Intel Corporation|21145"
-0x8086	0x0122	"unknown"	"Intel Corporation|82437FX"
-0x8086	0x0309	"unknown"	"Intel Corporation|80303 I/O Processor PCI-to-PCI Bridge Unit"
-0x8086	0x030d	"unknown"	"Intel Corporation|80312 I/O Companion Unit PCI-to-PCI Bridge"
-0x8086	0x0318	"unknown"	"Intel Corporation|80219 General Purpose PCI Processor Address Translation Unit"
-0x8086	0x0319	"unknown"	"Intel Corporation|80219 General Purpose PCI Processor Address Translation Unit"
+0x8086	0x0039	"tulip"	"Intel Corp.|21145"
+0x8086	0x0122	"unknown"	"Intel Corp.|82437FX"
+0x8086	0x0309	"unknown"	"Intel Corp.|80303 I/O Processor PCI-to-PCI Bridge Unit"
+0x8086	0x030d	"unknown"	"Intel Corp.|80312 I/O Companion Unit PCI-to-PCI Bridge"
+0x8086	0x0318	"unknown"	"Intel Corp.|80219 General Purpose PCI Processor Address Translation Unit"
+0x8086	0x0319	"unknown"	"Intel Corp.|80219 General Purpose PCI Processor Address Translation Unit"
 0x8086	0x0326	"unknown"	"Intel Corp.|PCI Bridge Hub I/OxAPIC Interrupt Controller A"
 0x8086	0x0327	"unknown"	"Intel Corp.|PCI Bridge Hub I/OxAPIC Interrupt Controller B"
 0x8086	0x0329	"unknown"	"Intel Corp.|PCI Bridge Hub A"
@@ -4631,44 +5136,45 @@
 0x8086	0x0336	"unknown"	"Intel Corp.|80331 [Lindsay] I/O processor"
 0x8086	0x0340	"unknown"	"Intel Corp.|41210 [Lanai] Serial to Parallel PCI Bridge"
 0x8086	0x0341	"unknown"	"Intel Corp.|41210 [Lanai] Serial to Parallel PCI Bridge"
-0x8086	0x0482	"unknown"	"Intel Corporation|82375EB"
-0x8086	0x0483	"unknown"	"Intel Corporation|82424ZX [Saturn]"
-0x8086	0x0484	"unknown"	"Intel Corporation|82378IB [SIO ISA Bridge]"
-0x8086	0x0486	"unknown"	"Intel Corporation|82430ZX [Aries]"
-0x8086	0x04a3	"unknown"	"Intel Corporation|82434LX [Mercury/Neptune]"
-0x8086	0x04d0	"unknown"	"Intel Corporation|82437FX [Triton FX]"
-0x8086	0x0500	"unknown"	"Intel Corporation|E8870 Processor Bus Controller"
-0x8086	0x0501	"unknown"	"Intel Corporation|E8870 Memory Controller"
-0x8086	0x0502	"unknown"	"Intel Corporation|E8870 Scalability Port 0"
-0x8086	0x0503	"unknown"	"Intel Corporation|E8870 Scalability Port 1 / Glob. Perf. Monitor"
-0x8086	0x0510	"unknown"	"Intel Corporation|E8870IO Hub Interface Port 0 (8-bit compatible)"
-0x8086	0x0511	"unknown"	"Intel Corporation|E8870IO Hub Interface Port 1"
-0x8086	0x0512	"unknown"	"Intel Corporation|E8870IO Hub Interface Port 2"
-0x8086	0x0513	"unknown"	"Intel Corporation|E8870IO Hub Interface Port 3"
-0x8086	0x0514	"unknown"	"Intel Corporation|E8870IO Hub Interface Port 4"
-0x8086	0x0515	"unknown"	"Intel Corporation|E8870IO Server I/O Hub (SIOH)"
-0x8086	0x0516	"unknown"	"Intel Corporation|E8870IO Reliabilty, Availability, Serviceability"
-0x8086	0x0530	"unknown"	"Intel Corporation|E8870SP Scalability Port"
-0x8086	0x0531	"unknown"	"Intel Corporation|E8870SP Scalability Port"
-0x8086	0x0532	"unknown"	"Intel Corporation|E8870SP Scalability Port"
-0x8086	0x0533	"unknown"	"Intel Corporation|E8870SP Scalability Port"
-0x8086	0x0534	"unknown"	"Intel Corporation|E8870SP Scalability Port"
-0x8086	0x0535	"unknown"	"Intel Corporation|E8870SP Scalability Port"
-0x8086	0x0536	"unknown"	"Intel Corporation|E8870SP Scalability Port Switch Global Registers"
-0x8086	0x0537	"unknown"	"Intel Corporation|E8870SP Interleave Configuration Registers"
-0x8086	0x0600	"gdth"	"RAID Controller"
-0x8086	0x0601	"gdth"	""
-0x8086	0x0960	"unknown"	"Intel Corporation|80960RP [i960 RP Microprocessor/Bridge]"
-0x8086	0x0962	"unknown"	"Intel Corporation|80960RM [i960RM Bridge]"
-0x8086	0x0964	"unknown"	"Intel Corporation|80960RP [i960 RP Microprocessor/Bridge]"
-0x8086	0x1000	"e1000"	"Intel Corporation|82542 Gigabit Ethernet Adapter"
-0x8086	0x1001	"e1000"	"Intel Corporation|82543 Gigabit Ethernet Adapter"
-0x8086	0x1002	"eepro100"	"Intel Corporation|Pro 100 LAN+Modem 56 CardBus II"
-0x8086	0x1004	"e1000"	"Intel Corporation| Gigabit Ethernet Adapter"
-0x8086	0x1008	"e1000"	"Intel Corporation|82544EI Gigabit Ethernet Controller"
-0x8086	0x1009	"e1000"	"Intel Corporation|82544EI Gigabit Ethernet Controller"
-0x8086	0x100c	"e1000"	"Intel Corporation|82544GC Gigabit Ethernet Controller"
-0x8086	0x100d	"e1000"	"Intel Corporation|82544GC Gigabit Ethernet Controller"
+0x8086	0x0482	"unknown"	"Intel Corp.|82375EB"
+0x8086	0x0483	"unknown"	"Intel Corp.|82424ZX [Saturn]"
+0x8086	0x0484	"unknown"	"Intel Corp.|82378IB [SIO ISA Bridge]"
+0x8086	0x0486	"unknown"	"Intel Corp.|82430ZX [Aries]"
+0x8086	0x04a3	"unknown"	"Intel Corp.|82434LX [Mercury/Neptune]"
+0x8086	0x04d0	"unknown"	"Intel Corp.|82437FX [Triton FX]"
+0x8086	0x0500	"unknown"	"Intel Corp.|E8870 Processor Bus Controller"
+0x8086	0x0501	"unknown"	"Intel Corp.|E8870 Memory Controller"
+0x8086	0x0502	"unknown"	"Intel Corp.|E8870 Scalability Port 0"
+0x8086	0x0503	"unknown"	"Intel Corp.|E8870 Scalability Port 1 / Glob. Perf. Monitor"
+0x8086	0x0510	"unknown"	"Intel Corp.|E8870IO Hub Interface Port 0 (8-bit compatible)"
+0x8086	0x0511	"unknown"	"Intel Corp.|E8870IO Hub Interface Port 1"
+0x8086	0x0512	"unknown"	"Intel Corp.|E8870IO Hub Interface Port 2"
+0x8086	0x0513	"unknown"	"Intel Corp.|E8870IO Hub Interface Port 3"
+0x8086	0x0514	"unknown"	"Intel Corp.|E8870IO Hub Interface Port 4"
+0x8086	0x0515	"unknown"	"Intel Corp.|E8870IO Server I/O Hub (SIOH)"
+0x8086	0x0516	"unknown"	"Intel Corp.|E8870IO Reliabilty, Availability, Serviceability"
+0x8086	0x0530	"unknown"	"Intel Corp.|E8870SP Scalability Port"
+0x8086	0x0531	"unknown"	"Intel Corp.|E8870SP Scalability Port"
+0x8086	0x0532	"unknown"	"Intel Corp.|E8870SP Scalability Port"
+0x8086	0x0533	"unknown"	"Intel Corp.|E8870SP Scalability Port"
+0x8086	0x0534	"unknown"	"Intel Corp.|E8870SP Scalability Port"
+0x8086	0x0535	"unknown"	"Intel Corp.|E8870SP Scalability Port"
+0x8086	0x0536	"unknown"	"Intel Corp.|E8870SP Scalability Port Switch Global Registers"
+0x8086	0x0537	"unknown"	"Intel Corp.|E8870SP Interleave Configuration Registers"
+0x8086	0x0600	"gdth"	"Intel Corp.|RAID Controller"
+0x8086	0x0601	"gdth"	"Intel Corp.|"
+0x8086	0x061f	"unknown"	"Intel Corp.|80303 I/O Processor"
+0x8086	0x0960	"unknown"	"Intel Corp.|80960RP [i960 RP Microprocessor/Bridge]"
+0x8086	0x0962	"unknown"	"Intel Corp.|80960RM [i960RM Bridge]"
+0x8086	0x0964	"unknown"	"Intel Corp.|80960RP [i960 RP Microprocessor/Bridge]"
+0x8086	0x1000	"e1000"	"Intel Corp.|82542 Gigabit Ethernet Adapter"
+0x8086	0x1001	"e1000"	"Intel Corp.|82543 Gigabit Ethernet Adapter"
+0x8086	0x1002	"eepro100"	"Intel Corp.|Pro 100 LAN+Modem 56 CardBus II"
+0x8086	0x1004	"e1000"	"Intel Corp.| Gigabit Ethernet Adapter"
+0x8086	0x1008	"e1000"	"Intel Corp.|82544EI Gigabit Ethernet Controller"
+0x8086	0x1009	"e1000"	"Intel Corp.|82544EI Gigabit Ethernet Controller"
+0x8086	0x100c	"e1000"	"Intel Corp.|82544GC Gigabit Ethernet Controller"
+0x8086	0x100d	"e1000"	"Intel Corp.|82544GC Gigabit Ethernet Controller"
 0x8086	0x100e	"e1000"	"Intel Corp.|82540EM Gigabit Ethernet Controller"
 0x8086	0x100f	"e1000"	"Intel Corp.|82545EM Gigabit Ethernet Controller"
 0x8086	0x1010	"e1000"	"Intel Corp.|82546EB Gigabit Ethernet Controller"
@@ -4681,32 +5187,51 @@
 0x8086	0x1017	"e1000"	"Intel Corp.|82540EP Gigabit Ethernet Controller (LOM)"
 0x8086	0x1018	"e1000"	"Intel Corp.|82541EI PRO/1000 MT Mobile connection"
 0x8086	0x1019	"e1000"	"Intel Corp.|82547EI Gigabit Ethernet Controller"
-0x8086	0x101a	"unknown"	"Intel Corporation|82547EI Gigabit Ethernet Controller (Mobile)"
+0x8086	0x101a	"unknown"	"Intel Corp.|82547EI Gigabit Ethernet Controller (Mobile)"
 0x8086	0x101d	"e1000"	"Intel Corp.|82540EM Gigabit Ethernet Controller (LOM)"
 0x8086	0x101e	"e1000"	"Intel Corp.|82540EP Gigabit Ethernet Controller (Mobile)"
 0x8086	0x1026	"e1000"	"Intel Corp.|82545GM Gigabit Ethernet Controller"
 0x8086	0x1027	"e1000"	"Intel Corp.|82545GM Gigabit Ethernet Controller (Fiber)"
 0x8086	0x1028	"e1000"	"Intel Corp.|82545GM Gigabit Ethernet Controller"
-0x8086	0x1029	"eepro100"	"Intel Corporation|Express Pro 100"
-0x8086	0x1030	"eepro100"	"Intel Corporation|82559 InBusiness 10/100"
-0x8086	0x1031	"e100"	"Intel Corporation|Express Pro 100"
-0x8086	0x1032	"e100"	"Intel Corporation|Express Pro 100"
-0x8086	0x1033	"e100"	"Intel Corporation|Express Pro 100"
-0x8086	0x1034	"e100"	"Intel Corporation|Express Pro 100"
-0x8086	0x1035	"eepro100"	"Intel Corporation|82801CAM (ICH3) Chipset Ethernet Controller"
-0x8086	0x1036	"eepro100"	"Intel Corporation|82801CAM (ICH3) Chipset Ethernet Controller"
-0x8086	0x1037	"eepro100"	"Intel Corporation|82801CAM (ICH3) Chipset Ethernet Controller"
-0x8086	0x1038	"e100"	"Intel Corporation|Express Pro 100"
-0x8086	0x1039	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
-0x8086	0x103a	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
-0x8086	0x103b	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
-0x8086	0x103c	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
+0x8086	0x1029	"eepro100"	"Intel Corp.|Express Pro 100"
+0x8086	0x1030	"eepro100"	"Intel Corp.|82559 InBusiness 10/100"
+0x8086	0x1031	"e100"	"Intel Corp.|Express Pro 100"
+0x8086	0x1032	"e100"	"Intel Corp.|Express Pro 100"
+0x8086	0x1033	"e100"	"Intel Corp.|Express Pro 100"
+0x8086	0x1034	"e100"	"Intel Corp.|Express Pro 100"
+0x8086	0x1035	"eepro100"	"Intel Corp.|82801CAM (ICH3) Chipset Ethernet Controller"
+0x8086	0x1036	"eepro100"	"Intel Corp.|82801CAM (ICH3) Chipset Ethernet Controller"
+0x8086	0x1037	"eepro100"	"Intel Corp.|82801CAM (ICH3) Chipset Ethernet Controller"
+0x8086	0x1038	"e100"	"Intel Corp.|Express Pro 100"
+0x8086	0x1039	"eepro100"	"Intel Corp.|EtherExpress PRO/100"
+0x8086	0x103a	"eepro100"	"Intel Corp.|EtherExpress PRO/100"
+0x8086	0x103b	"eepro100"	"Intel Corp.|EtherExpress PRO/100"
+0x8086	0x103c	"eepro100"	"Intel Corp.|EtherExpress PRO/100"
 0x8086	0x103d	"eepro100"	"Intel Corp.|82801BD PRO/100 VE (MOB) Ethernet Controller"
 0x8086	0x103e	"eepro100"	"Intel Corp.|82801BD PRO/100 VM (MOB) Ethernet Controller"
 0x8086	0x1040	"unknown"	"Intel Corp.|536EP v.92 modem (MD5628D-L-C ?)"
-0x8086	0x1042	"unknown"	"Intel Corporation|PRO/Wireless 2011 LAN PCI Card"
-0x8086	0x1043	"unknown"	"Intel Corp.|PRO/Wireless LAN 2100 3B Mini PCI Adapter"
+0x8086	0x1042	"unknown"	"Intel Corp.|PRO/Wireless 2011 LAN PCI Card"
+0x8086	0x1043	0x103c	0x2741	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2527	"ipw2100"	"Intel Corp.|MIM2000/Centrino"
+0x8086	0x1043	0x8086	0x2701	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2702	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2711	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2712	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2721	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2722	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2731	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2732	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2741	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2742	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2751	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2752	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2753	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2754	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+0x8086	0x1043	0x8086	0x2761	"ipw2200"	"Intel Corp.|PRO/Wireless LAN 2200"
+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	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"
 0x8086	0x1052	"e100"	"Intel Corp.|82801EB (ICH5) PRO/100 VM Ethernet Controller"
@@ -4714,6 +5239,14 @@
 0x8086	0x1054	"e100"	"Intel Corp.|82801EB (ICH5) PRO/100 VE Ethernet Controller"
 0x8086	0x1055	"e100"	"Intel Corp.|82801EB (ICH5) PRO/100 VM Ethernet Controller"
 0x8086	0x1059	"e100"	"Intel Corp.|82551QM Ethernet Controller"
+0x8086	0x1064	"e100"	"Intel Corp.|Ethernet Controller"
+0x8086	0x1065	"e100"	"Intel Corp.|82801FB/FBM/FR/FW/FRW (ICH6 Family) LAN Controller"
+0x8086	0x1066	"e100"	"Intel Corp.|Ethernet Controller"
+0x8086	0x1067	"e100"	"Intel Corp.|Ethernet Controller"
+0x8086	0x1068	"e100"	"Intel Corp.|Ethernet Controller"
+0x8086	0x1069	"e100"	"Intel Corp.|Ethernet Controller"
+0x8086	0x106a	"e100"	"Intel Corp.|Ethernet Controller"
+0x8086	0x106b	"e100"	"Intel Corp.|Ethernet Controller"
 0x8086	0x1075	"e1000"	"Intel Corp.|82547EI Gigabit Ethernet Controller"
 0x8086	0x1076	"e1000"	"Intel Corp.|82547EI Gigabit Ethernet Controller"
 0x8086	0x1077	"e1000"	"Intel Corp.|82547EI Gigabit Ethernet Controller(Mobile)"
@@ -4721,27 +5254,28 @@
 0x8086	0x1079	"e1000"	"Intel Corp.|82546EB Dual Port Gigabit Ethernet Controller"
 0x8086	0x107a	"e1000"	"Intel Corp.|82546EB Dual Port Gigabit Ethernet Controller (Fiber)"
 0x8086	0x107b	"e1000"	"Intel Corp.|82546EB Dual Port Gigabit Ethernet Controller (Copper)"
-0x8086	0x1100	"unknown"	"Intel Corporation|82815 Host-Hub Interface Bridge / DRAM Ctrlr"
-0x8086	0x1101	"unknown"	"Intel Corporation|82815 AGP Bridge"
-0x8086	0x1102	"unknown"	"Intel Corporation|82815 Internal Graphics Device"
-0x8086	0x1110	"unknown"	"Intel Corporation|8x815 Host-Hub Interface Bridge / DRAM Ctrlr"
-0x8086	0x1112	"unknown"	"Intel Corporation|82815 Internal Graphics Device"
-0x8086	0x1120	"unknown"	"Intel Corporation|82815 Host-Hub Interface Bridge / DRAM Ctrlr"
-0x8086	0x1121	"unknown"	"Intel Corporation|82815 AGP Bridge"
-0x8086	0x1130	"intel-agp"	"Intel Corporation|82815 815 Chipset Host Bridge and Memory Controller Hub"
-0x8086	0x1131	"unknown"	"Intel Corporation|82815/82815EM/EP AGP Bridge"
-0x8086	0x1132	"Card:Intel 815"	"Intel Corporation|82815 CGC [Chipset Graphics Controller]"
-0x8086	0x1161	"unknown"	"Intel Corporation|82806AA PCI64 Hub Advanced Programmable Interrupt Controller"
+0x8086	0x1100	"unknown"	"Intel Corp.|82815 Host-Hub Interface Bridge / DRAM Ctrlr"
+0x8086	0x1101	"unknown"	"Intel Corp.|82815 AGP Bridge"
+0x8086	0x1102	"unknown"	"Intel Corp.|82815 Internal Graphics Device"
+0x8086	0x1107	"unknown"	"Intel Corp.|PRO/1000 MF Server Adapter (LX)"
+0x8086	0x1110	"unknown"	"Intel Corp.|8x815 Host-Hub Interface Bridge / DRAM Ctrlr"
+0x8086	0x1112	"unknown"	"Intel Corp.|82815 Internal Graphics Device"
+0x8086	0x1120	"unknown"	"Intel Corp.|82815 Host-Hub Interface Bridge / DRAM Ctrlr"
+0x8086	0x1121	"unknown"	"Intel Corp.|82815 AGP Bridge"
+0x8086	0x1130	"intel-agp"	"Intel Corp.|82815 815 Chipset Host Bridge and Memory Controller Hub"
+0x8086	0x1131	"unknown"	"Intel Corp.|82815/82815EM/EP AGP Bridge"
+0x8086	0x1132	"Card:Intel 815"	"Intel Corp.|82815 CGC [Chipset Graphics Controller]"
+0x8086	0x1161	"unknown"	"Intel Corp.|82806AA PCI64 Hub Advanced Programmable Interrupt Controller"
 0x8086	0x1162	"unknown"	"Intel Corp.|Xscale 80200 Big Endian Companion Chip"
-0x8086	0x1200	"paep"	"Intel Corporation|Unknown device"
-0x8086	0x1209	"eepro100"	"Intel Corporation|82559ER"
-0x8086	0x1221	"yenta_socket"	"Intel Corporation|82092AA_0"
-0x8086	0x1222	"yenta_socket"	"Intel Corporation|82092AA_1"
-0x8086	0x1223	"unknown"	"Intel Corporation|SAA7116"
-0x8086	0x1225	"unknown"	"Intel Corporation|82452KX/GX [Orion]"
-0x8086	0x1226	"unknown"	"Intel Corporation|82596"
-0x8086	0x1227	"eepro100"	"Intel Corporation|82865 [Ether Express Pro 100]"
-0x8086	0x1228	"eepro100"	"Intel Corporation|82556 [Ether Express Pro 100 Smart]"
+0x8086	0x1200	"paep"	"Intel Corp.|Unknown device"
+0x8086	0x1209	"eepro100"	"Intel Corp.|82559ER"
+0x8086	0x1221	"i82092"	"Intel Corp.|82092AA_0"
+0x8086	0x1222	"yenta_socket"	"Intel Corp.|82092AA_1"
+0x8086	0x1223	"unknown"	"Intel Corp.|SAA7116"
+0x8086	0x1225	"unknown"	"Intel Corp.|82452KX/GX [Orion]"
+0x8086	0x1226	"unknown"	"Intel Corp.|82596"
+0x8086	0x1227	"eepro100"	"Intel Corp.|82865 [Ether Express Pro 100]"
+0x8086	0x1228	"eepro100"	"Intel Corp.|82556 [Ether Express Pro 100 Smart]"
 0x8086	0x1229	0x0e11	0x3001	"eepro100"	"Intel Corp.|82559 Fast Ethernet LOM with Alert on LAN*"
 0x8086	0x1229	0x0e11	0x3002	"eepro100"	"Intel Corp.|82559 Fast Ethernet LOM with Alert on LAN*"
 0x8086	0x1229	0x0e11	0x3003	"eepro100"	"Intel Corp.|82559 Fast Ethernet LOM with Alert on LAN*"
@@ -4781,6 +5315,7 @@
 0x8086	0x1229	0x1014	0x705c	"eepro100"	"Intel Corp.|10/100 Netfinity 10/100 Ethernet Security Adapter"
 0x8086	0x1229	0x1014	0x805c	"eepro100"	"Intel Corp.|10/100 Netfinity 10/100 Ethernet Security Adapter"
 0x8086	0x1229	0x1028	0x009b	"eepro100"	"Intel Corp.|PowerEdge 2550"
+0x8086	0x1229	0x1028	0x00ce	"eepro100"	"Intel Corp.|PowerEdge 1400"
 0x8086	0x1229	0x1033	0x8000	"eepro100"	"Intel Corp.|PC-9821X-B06"
 0x8086	0x1229	0x1033	0x8016	"eepro100"	"Intel Corp.|PK-UG-X006"
 0x8086	0x1229	0x1033	0x801f	"eepro100"	"Intel Corp.|PK-UG-X006"
@@ -4803,9 +5338,11 @@
 0x8086	0x1229	0x1259	0x2560	"eepro100"	"Intel Corp.|AT-2560 100"
 0x8086	0x1229	0x1259	0x2561	"eepro100"	"Intel Corp.|AT-2560 100 FX Ethernet Adapter"
 0x8086	0x1229	0x1266	0x0001	"eepro100"	"Intel Corp.|NE10/100 Adapter"
+0x8086	0x1229	0x13e9	0x1000	"eepro100"	"Intel Corp.|6221L-4U"
 0x8086	0x1229	0x144d	0x2501	"eepro100"	"Intel Corp.|SEM-2000 MiniPCI LAN Adapter"
 0x8086	0x1229	0x144d	0x2502	"eepro100"	"Intel Corp.|SEM-2100IL MiniPCI LAN Adapter"
 0x8086	0x1229	0x1668	0x1100	"eepro100"	"Intel Corp.|EtherExpress PRO/100B (TX) (MiniPCI Ethernet+Modem)"
+0x8086	0x1229	0x4c53	0x1080	"eepro100"	"Intel Corp.|CT8 mainboard"
 0x8086	0x1229	0x8086	0x0001	"eepro100"	"Intel Corp.|EtherExpress PRO/100B (TX)"
 0x8086	0x1229	0x8086	0x0002	"eepro100"	"Intel Corp.|EtherExpress PRO/100B (T4)"
 0x8086	0x1229	0x8086	0x0003	"eepro100"	"Intel Corp.|EtherExpress PRO/10+"
@@ -4815,7 +5352,7 @@
 0x8086	0x1229	0x8086	0x0007	"eepro100"	"Intel Corp.|82558 10/100 Adapter"
 0x8086	0x1229	0x8086	0x0008	"eepro100"	"Intel Corp.|82558 10/100 with Wake on LAN"
 0x8086	0x1229	0x8086	0x0009	"eepro100"	"Intel Corp.|EtherExpress PRO/100+"
-0x8086	0x1229	0x8086	0x000a	"e100"	"Intel Corporation|82559 [Ethernet Pro 100]"
+0x8086	0x1229	0x8086	0x000a	"e100"	"Intel Corp.|82559 [Ethernet Pro 100]"
 0x8086	0x1229	0x8086	0x000b	"eepro100"	"Intel Corp.|EtherExpress PRO/100+"
 0x8086	0x1229	0x8086	0x000c	"eepro100"	"Intel Corp.|EtherExpress PRO/100+ Management Adapter"
 0x8086	0x1229	0x8086	0x000d	"eepro100"	"Intel Corp.|EtherExpress PRO/100+ Alert On LAN II* Adapter"
@@ -4890,29 +5427,30 @@
 0x8086	0x1229	0x8086	0x3010	"eepro100"	"Intel Corp.|EtherExpress PRO/100 S Network Connection"
 0x8086	0x1229	0x8086	0x3011	"eepro100"	"Intel Corp.|EtherExpress PRO/100 S Network Connection"
 0x8086	0x1229	0x8086	0x3012	"eepro100"	"Intel Corp.|EtherExpress PRO/100 Network Connection"
-0x8086	0x1229	"eepro100"	"Intel Corporation|82559 [Ethernet Pro 100]"
-0x8086	0x122d	"unknown"	"Intel Corporation|430FX - 82437FX TSC [Triton I]"
-0x8086	0x122e	"unknown"	"Intel Corporation|82371FB PIIX ISA [Triton I]"
-0x8086	0x1230	"unknown"	"Intel Corporation|82371FB PIIX IDE [Triton I]"
-0x8086	0x1231	"unknown"	"Intel Corporation|DSVD Modem"
-0x8086	0x1234	"unknown"	"Intel Corporation|430MX - 82371MX MPIIX [430MX PCIset - 82371MX Mobile PCI I/O IDE Xcelerator (MPIIX)]"
-0x8086	0x1235	"unknown"	"Intel Corporation|430MX - 82437MX MTSC [430MX PCIset - 82437MX Mobile System Controller (MTSC) and 82438MX Mobile Data Path (MTDP)]"
-0x8086	0x1237	"unknown"	"Intel Corporation|440FX - 82441FX PMC [Natoma]"
-0x8086	0x1239	"unknown"	"Intel Corporation|82371FB"
-0x8086	0x123b	"unknown"	"Intel Corporation|82380PB"
-0x8086	0x123c	"unknown"	"Intel Corporation|82380AB"
-0x8086	0x123d	"unknown"	"Intel Corporation|683053 Programmable Interrupt Device"
-0x8086	0x123e	"unknown"	"Intel Corporation|82466GX Integrated Hot-Plug Controller (IHPC)"
-0x8086	0x123f	"unknown"	"Intel Corporation|82466GX Integrated Hot-Plug Controller (IHPC)"
-0x8086	0x1240	"unknown"	"Intel Corporation|752 AGP"
-0x8086	0x124b	"unknown"	"Intel Corporation|82380FB"
-0x8086	0x1250	"unknown"	"Intel Corporation|430HX - 82439HX TXC [Triton II]"
-0x8086	0x1360	"unknown"	"Intel Corporation|82806AA PCI64 Hub PCI Bridge"
-0x8086	0x1361	"unknown"	"Intel Corporation|82806AA PCI64 Hub Controller (HRes)"
-0x8086	0x1460	"unknown"	"Intel Corporation|P64H2 PCI Bridge"
-0x8086	0x1461	"unknown"	"Intel Corporation|82870P2 P64H2 I/OxAPIC"
-0x8086	0x1462	"unknown"	"Intel Corporation|P64H2 PCI HotPlug Controller"
-0x8086	0x1960	0x0e11	0xc000	"unknown"	"Compaq Computer Corporation|Remote Insight Controller"
+0x8086	0x1229	0x8086	0x3411	"eepro100"	"Intel Corp.|SDS2 Mainboard"
+0x8086	0x1229	"eepro100"	"Intel Corp.|82559 [Ethernet Pro 100]"
+0x8086	0x122d	"unknown"	"Intel Corp.|430FX - 82437FX TSC [Triton I]"
+0x8086	0x122e	"unknown"	"Intel Corp.|82371FB PIIX ISA [Triton I]"
+0x8086	0x1230	"unknown"	"Intel Corp.|82371FB PIIX IDE [Triton I]"
+0x8086	0x1231	"unknown"	"Intel Corp.|DSVD Modem"
+0x8086	0x1234	"unknown"	"Intel Corp.|430MX - 82371MX MPIIX [430MX PCIset - 82371MX Mobile PCI I/O IDE Xcelerator (MPIIX)]"
+0x8086	0x1235	"unknown"	"Intel Corp.|430MX - 82437MX MTSC [430MX PCIset - 82437MX Mobile System Controller (MTSC) and 82438MX Mobile Data Path (MTDP)]"
+0x8086	0x1237	"unknown"	"Intel Corp.|440FX - 82441FX PMC [Natoma]"
+0x8086	0x1239	"unknown"	"Intel Corp.|82371FB"
+0x8086	0x123b	"unknown"	"Intel Corp.|82380PB"
+0x8086	0x123c	"unknown"	"Intel Corp.|82380AB"
+0x8086	0x123d	"unknown"	"Intel Corp.|683053 Programmable Interrupt Device"
+0x8086	0x123e	"unknown"	"Intel Corp.|82466GX Integrated Hot-Plug Controller (IHPC)"
+0x8086	0x123f	"unknown"	"Intel Corp.|82466GX Integrated Hot-Plug Controller (IHPC)"
+0x8086	0x1240	"unknown"	"Intel Corp.|752 AGP"
+0x8086	0x124b	"unknown"	"Intel Corp.|82380FB"
+0x8086	0x1250	"unknown"	"Intel Corp.|430HX - 82439HX TXC [Triton II]"
+0x8086	0x1360	"unknown"	"Intel Corp.|82806AA PCI64 Hub PCI Bridge"
+0x8086	0x1361	"unknown"	"Intel Corp.|82806AA PCI64 Hub Controller (HRes)"
+0x8086	0x1460	"unknown"	"Intel Corp.|P64H2 PCI Bridge"
+0x8086	0x1461	"unknown"	"Intel Corp.|82870P2 P64H2 I/OxAPIC"
+0x8086	0x1462	"unknown"	"Intel Corp.|P64H2 PCI HotPlug Controller"
+0x8086	0x1960	0x0e11	0xc000	"unknown"	"Compaq Computer Corp.|Remote Insight Controller"
 0x8086	0x1960	0x101e	0x0431	"megaraid"	"Intel Corp.|MegaRAID 431 RAID Controller"
 0x8086	0x1960	0x101e	0x0438	"megaraid"	"Intel Corp.|MegaRAID 438 Ultra2 LVD RAID Controller"
 0x8086	0x1960	0x101e	0x0466	"megaraid"	"Intel Corp.|MegaRAID 466 Express Plus RAID Controller"
@@ -4933,135 +5471,142 @@
 0x8086	0x1960	0x1111	0x1111	"megaraid"	"Intel Corp.|MegaRAID 466, PowerEdge Expandable RAID Controller 2/SC"
 0x8086	0x1960	0x1111	0x1112	"megaraid"	"Intel Corp.|PowerEdge Expandable RAID Controller 2/SC"
 0x8086	0x1960	0x113c	0x03a2	"megaraid"	"Intel Corp.|MegaRAID"
-0x8086	0x1960	"megaraid"	"Intel Corporation|80960RP [i960RP Microprocessor]"
+0x8086	0x1960	0xe4bf	0x1010	"megaraid"	"Intel Corp.|CG1-RADIO"
+0x8086	0x1960	0xe4bf	0x1020	"megaraid"	"Intel Corp.|CU2-QUARTET"
+0x8086	0x1960	0xe4bf	0x1040	"megaraid"	"Intel Corp.|CU1-CHORUS"
+0x8086	0x1960	0xe4bf	0x3100	"megaraid"	"Intel Corp.|CX1-BAND"
+0x8086	0x1960	0xe4bf	0xffff	"8250_pci"	""
+0x8086	0x1960	"megaraid"	"Intel Corp.|80960RP [i960RP Microprocessor]"
 0x8086	0x1962	"unknown"	"Intel Corp.|80960RM [i960RM Microprocessor]"
-0x8086	0x1a10	"unknown"	"Intel Corporation|Celeron(tm) Processor to I/O Controller"
-0x8086	0x1a11	"unknown"	"Intel Corporation|Celeron(tm) Processor to I/O Controller"
-0x8086	0x1a12	"unknown"	"Intel Corporation|??? Eicon DIVA Server Voice PRI 2.0 (PCI)"
-0x8086	0x1a13	"unknown"	"Intel Corporation|??? Eicon DIVA Server Voice PRI 2.0 (PCI)"
-0x8086	0x1a20	"unknown"	"Intel Corporation|82840"
-0x8086	0x1a21	"intel-agp"	"Intel Corporation|82840 840 (Carmel) Chipset Host Bridge (Hub A)"
-0x8086	0x1a22	"unknown"	"Intel Corporation|82840 Host to I/O Hub Bridge (Quad PCI)"
-0x8086	0x1a23	"unknown"	"Intel Corporation|82840 840 (Carmel) Chipset AGP Bridge"
-0x8086	0x1a24	"unknown"	"Intel Corporation|82840 840 (Carmel) Chipset PCI Bridge (Hub B)"
-0x8086	0x1a30	"intel-agp"	"Intel Corporation|82845 845 (Brookdale) Chipset Host Bridge"
-0x8086	0x1a31	"unknown"	"Intel Corporation|82845 845 (Brookdale) Chipset AGP Bridge"
-0x8086	0x2125	"unknown"	"Intel Corporation|82801AB AC97 Audio Controller"
-0x8086	0x2410	"i810-tco"	"Intel Corporation|82801AA 810 Chipset LPC Interface Bridge"
-0x8086	0x2411	"unknown"	"Intel Corporation|82801AA 810 Chipset IDE Controller"
-0x8086	0x2412	"usb-uhci"	"Intel Corporation|82801AA 810 Chipset USB Controller"
-0x8086	0x2413	"unknown"	"Intel Corporation|82801AA 810 Chipset SMBus Controller"
-0x8086	0x2415	"i810_audio"	"Intel Corporation|82801AA 810 Chipset AC'97 Audio Controller"
-0x8086	0x2416	"unknown"	"Intel Corporation|82801AA 810 Chipset AC'97 PCI Modem"
-0x8086	0x2418	"i810_rng"	"Intel Corporation|82801AA 810 Chipset Hub to PCI Bridge"
-0x8086	0x2420	"i810-tco"	"Intel Corporation|82801AB 810 Chipset LPC Interface Bridge"
-0x8086	0x2421	"unknown"	"Intel Corporation|82801AB 810 Chipset IDE Controller"
-0x8086	0x2422	"usb-uhci"	"Intel Corporation|82801AB 810 Chipset USB Controller"
-0x8086	0x2423	"unknown"	"Intel Corporation|82801AB 810 Chipset SMBus Controller"
-0x8086	0x2425	"i810_audio"	"Intel Corporation|82901 810 Chipset AC'97 Audio Controller"
-0x8086	0x2426	"unknown"	"Intel Corporation|82801AB 810 Chipset AC'97 PCI Modem"
-0x8086	0x2428	"i810_rng"	"Intel Corporation|82801AB 810 Chipset Hub to PCI Bridge"
-0x8086	0x2431	"unknown"	"Intel Corporation|82810 pci bus"
-0x8086	0x2440	"i810-tco"	"Intel Corporation|82820 815e (Camino 2) Chipset ISA Bridge (ICH2)"
-0x8086	0x2441	"unknown"	"Intel Corporation|82801BA IDE Controller (UltraATA/66)"
-0x8086	0x2442	"usb-uhci"	"Intel Corporation|82820 815e (Camino 2) Chipset USB (Hub A)"
-0x8086	0x2443	"unknown"	"Intel Corporation|82820 815e (Camino 2) Chipset SMBus"
-0x8086	0x2444	"usb-uhci"	"Intel Corporation|82820 815e (Camino 2) Chipset USB (Hub B)"
-0x8086	0x2445	"i810_audio"	"Intel Corporation|ICH2 810 Chipset AC'97 Audio Controller"
-0x8086	0x2446	"unknown"	"Intel Corporation|82820 820 (Camino 2) Chipset AC'97 Modem Controller"
-0x8086	0x2448	"i810_rng"	"Intel Corporation|82801 Hub Interface to PCI Bridge"
-0x8086	0x2449	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
-0x8086	0x244a	"unknown"	"Intel Corporation|82820 820 (Camino 2) Chipset IDE U100 (-M)"
-0x8086	0x244b	"unknown"	"Intel Corporation|82820 815e (Camino 2) Chipset IDE U100"
-0x8086	0x244c	"sonypi"	"Intel Corporation|82801BAM LPC Interface Bridge"
-0x8086	0x244e	"i810_rng"	"Intel Corporation|82820 815e (Camino 2) Chipset PCI"
+0x8086	0x1a10	"unknown"	"Intel Corp.|Celeron(tm) Processor to I/O Controller"
+0x8086	0x1a11	"unknown"	"Intel Corp.|Celeron(tm) Processor to I/O Controller"
+0x8086	0x1a12	"unknown"	"Intel Corp.|??? Eicon DIVA Server Voice PRI 2.0 (PCI)"
+0x8086	0x1a13	"unknown"	"Intel Corp.|??? Eicon DIVA Server Voice PRI 2.0 (PCI)"
+0x8086	0x1a20	"unknown"	"Intel Corp.|82840"
+0x8086	0x1a21	"intel-agp"	"Intel Corp.|82840 840 (Carmel) Chipset Host Bridge (Hub A)"
+0x8086	0x1a22	"unknown"	"Intel Corp.|82840 Host to I/O Hub Bridge (Quad PCI)"
+0x8086	0x1a23	"unknown"	"Intel Corp.|82840 840 (Carmel) Chipset AGP Bridge"
+0x8086	0x1a24	"unknown"	"Intel Corp.|82840 840 (Carmel) Chipset PCI Bridge (Hub B)"
+0x8086	0x1a30	"intel-agp"	"Intel Corp.|82845 845 (Brookdale) Chipset Host Bridge"
+0x8086	0x1a31	"unknown"	"Intel Corp.|82845 845 (Brookdale) Chipset AGP Bridge"
+0x8086	0x1a48	"ixgb"	"Intel Corp.|"
+0x8086	0x2125	"unknown"	"Intel Corp.|82801AB AC97 Audio Controller"
+0x8086	0x2410	"i810-tco"	"Intel Corp.|82801AA 810 Chipset LPC Interface Bridge"
+0x8086	0x2411	"unknown"	"Intel Corp.|82801AA 810 Chipset IDE Controller"
+0x8086	0x2412	"usb-uhci"	"Intel Corp.|82801AA 810 Chipset USB Controller"
+0x8086	0x2413	"i2c-i801"	"Intel Corp.|82801AA 810 Chipset SMBus Controller"
+0x8086	0x2415	"i810_audio"	"Intel Corp.|82801AA 810 Chipset AC'97 Audio Controller"
+0x8086	0x2416	"slamr"	"Intel Corp.|82801AA 810 Chipset AC'97 PCI Modem"
+0x8086	0x2418	"hw_random"	"Intel Corp.|82801AA 810 Chipset Hub to PCI Bridge"
+0x8086	0x2420	"i810-tco"	"Intel Corp.|82801AB 810 Chipset LPC Interface Bridge"
+0x8086	0x2421	"unknown"	"Intel Corp.|82801AB 810 Chipset IDE Controller"
+0x8086	0x2422	"usb-uhci"	"Intel Corp.|82801AB 810 Chipset USB Controller"
+0x8086	0x2423	"i2c-i801"	"Intel Corp.|82801AB 810 Chipset SMBus Controller"
+0x8086	0x2425	"i810_audio"	"Intel Corp.|82901 810 Chipset AC'97 Audio Controller"
+0x8086	0x2426	"slamr"	"Intel Corp.|82801AB 810 Chipset AC'97 PCI Modem"
+0x8086	0x2428	"hw_random"	"Intel Corp.|82801AB 810 Chipset Hub to PCI Bridge"
+0x8086	0x2431	"unknown"	"Intel Corp.|82810 pci bus"
+0x8086	0x2440	"i810-tco"	"Intel Corp.|82820 815e (Camino 2) Chipset ISA Bridge (ICH2)"
+0x8086	0x2441	"unknown"	"Intel Corp.|82801BA IDE Controller (UltraATA/66)"
+0x8086	0x2442	"usb-uhci"	"Intel Corp.|82820 815e (Camino 2) Chipset USB (Hub A)"
+0x8086	0x2443	"i2c-i801"	"Intel Corp.|82820 815e (Camino 2) Chipset SMBus"
+0x8086	0x2444	"usb-uhci"	"Intel Corp.|82820 815e (Camino 2) Chipset USB (Hub B)"
+0x8086	0x2445	"i810_audio"	"Intel Corp.|ICH2 810 Chipset AC'97 Audio Controller"
+0x8086	0x2446	"unknown"	"Intel Corp.|82820 820 (Camino 2) Chipset AC'97 Modem Controller"
+0x8086	0x2448	"hw_random"	"Intel Corp.|82801 Hub Interface to PCI Bridge"
+0x8086	0x2449	"eepro100"	"Intel Corp.|EtherExpress PRO/100"
+0x8086	0x244a	"unknown"	"Intel Corp.|82820 820 (Camino 2) Chipset IDE U100 (-M)"
+0x8086	0x244b	"unknown"	"Intel Corp.|82820 815e (Camino 2) Chipset IDE U100"
+0x8086	0x244c	"sonypi"	"Intel Corp.|82801BAM LPC Interface Bridge"
+0x8086	0x244e	"hw_random"	"Intel Corp.|82820 815e (Camino 2) Chipset PCI"
 0x8086	0x2450	"i810-tco"	"Intel Corp.|82801E ISA Bridge (LPC)"
 0x8086	0x2452	"unknown"	"Intel Corp.|82801E USB"
 0x8086	0x2453	"unknown"	"Intel Corp.|82801E SMBus"
 0x8086	0x2459	"eepro100"	"Intel Corp.|82801E Ethernet Controller 0"
 0x8086	0x245b	"unknown"	"Intel Corp.|82801E IDE U100"
 0x8086	0x245d	"eepro100"	"Intel Corp.|82801E Ethernet Controller 1"
-0x8086	0x245e	"i810_rng"	"Intel Corp.|82801E PCI Bridge"
-0x8086	0x2480	"i810-tco"	"Intel Corporation|82801CA LPC Interface"
-0x8086	0x2481	"unknown"	"Intel Corporation|82801CA IDE Controller (UltraATA/66)"
-0x8086	0x2482	"usb-uhci"	"Intel Corporation|82801 USB Controller"
-0x8086	0x2483	"unknown"	"Intel Corporation|82801 SMBus Controller"
-0x8086	0x2484	"unknown"	"Intel Corporation|82801 USB Controller"
-0x8086	0x2485	"i810_audio"	"Intel Corporation|82801 AC97 Audio Controller"
-0x8086	0x2486	"unknown"	"Intel Corporation|PCTEL 2304 WT V.92 MDC Modem"
-0x8086	0x2487	"unknown"	"Intel Corporation|82801 USB Controller"
-0x8086	0x248a	"unknown"	"Intel Corporation|82801 UltraATA IDE Controller"
-0x8086	0x248b	"unknown"	"Intel Corporation|82801CA/CAM UltraATA IDE Controller"
-0x8086	0x248c	"i810-tco"	"Intel Corporation|82801 LPC Interface"
-0x8086	0x248d	"unknown"	"Intel Corporation|82801?? USB 2.0 EHCI Contoroller"
-0x8086	0x24c0	"i810-tco"	"Intel Corporation|82801DB 845G/GL Chipset ISA Bridge (ICH4)"
-0x8086	0x24c2	"usb-uhci"	"Intel Corporation|82801DB USB Controller"
-0x8086	0x24c3	"unknown"	"Intel Corporation|82801DB SMBus Controller"
-0x8086	0x24c4	"usb-uhci"	"Intel Corporation|82801DB USB Controller"
-0x8086	0x24c5	"snd-intel8x0"	"Intel Corporation|ICH4 845G/GL Chipset AC'97 Audio Controller"
-0x8086	0x24c6	"unknown"	"Intel Corp.|82801DB AC"
-0x8086	0x24c7	"usb-uhci"	"Intel Corporation|82801DB USB Controller"
-0x8086	0x24ca	"unknown"	"Intel Corporation|82801DBM IDE Controller (UltraATA/100)"
-0x8086	0x24cb	"unknown"	"Intel Corporation|82801DB 845G/GL Chipset IDE Controller"
-0x8086	0x24cc	"unknown"	"Intel Corporation|82801DBM LPC Interface Bridge"
-0x8086	0x24cd	"ehci-hcd"	"Intel Corporation|82801DB USB Enhanced Controller"
+0x8086	0x245e	"hw_random"	"Intel Corp.|82801E PCI Bridge"
+0x8086	0x2480	"i810-tco"	"Intel Corp.|82801CA LPC Interface"
+0x8086	0x2481	"unknown"	"Intel Corp.|82801CA IDE Controller (UltraATA/66)"
+0x8086	0x2482	"usb-uhci"	"Intel Corp.|82801 USB Controller"
+0x8086	0x2483	"i2c-i801"	"Intel Corp.|82801 SMBus Controller"
+0x8086	0x2484	"unknown"	"Intel Corp.|82801 USB Controller"
+0x8086	0x2485	"i810_audio"	"Intel Corp.|82801 AC97 Audio Controller"
+0x8086	0x2486	"slamr"	"Intel Corp.|PCTEL 2304 WT V.92 MDC Modem"
+0x8086	0x2487	"unknown"	"Intel Corp.|82801 USB Controller"
+0x8086	0x248a	"unknown"	"Intel Corp.|82801 UltraATA IDE Controller"
+0x8086	0x248b	"unknown"	"Intel Corp.|82801CA/CAM UltraATA IDE Controller"
+0x8086	0x248c	"i810-tco"	"Intel Corp.|82801 LPC Interface"
+0x8086	0x248d	"unknown"	"Intel Corp.|82801?? USB 2.0 EHCI Contoroller"
+0x8086	0x24c0	"i810-tco"	"Intel Corp.|82801DB 845G/GL Chipset ISA Bridge (ICH4)"
+0x8086	0x24c1	"unknown"	"Intel Corp.|82801DBL (ICH4-L) IDE Controller"
+0x8086	0x24c2	"usb-uhci"	"Intel Corp.|82801DB USB Controller"
+0x8086	0x24c3	"i2c-i801"	"Intel Corp.|82801DB SMBus Controller"
+0x8086	0x24c4	"usb-uhci"	"Intel Corp.|82801DB USB Controller"
+0x8086	0x24c5	"snd-intel8x0"	"Intel Corp.|ICH4 845G/GL Chipset AC'97 Audio Controller"
+0x8086	0x24c6	"slamr"	"Intel Corp.|82801DB AC"
+0x8086	0x24c7	"usb-uhci"	"Intel Corp.|82801DB USB Controller"
+0x8086	0x24ca	"unknown"	"Intel Corp.|82801DBM IDE Controller (UltraATA/100)"
+0x8086	0x24cb	"unknown"	"Intel Corp.|82801DB 845G/GL Chipset IDE Controller"
+0x8086	0x24cc	"unknown"	"Intel Corp.|82801DBM LPC Interface Bridge"
+0x8086	0x24cd	"ehci-hcd"	"Intel Corp.|82801DB USB Enhanced Controller"
 0x8086	0x24d0	"i810-tco"	"Intel Corp.|82801EB ISA Bridge (LPC)"
 0x8086	0x24d1	"ata_piix"	"Intel Corp.|82801EB ICH5 IDE (SATA)"
-0x8086	0x24d2	"usb-uhci"	"Intel Corporation|USB Controller"
-0x8086	0x24d3	"unknown"	"Intel Corp.|82801EB SMBus"
-0x8086	0x24d4	"usb-uhci"	"Intel Corporation|USB Controller"
+0x8086	0x24d2	"usb-uhci"	"Intel Corp.|USB Controller"
+0x8086	0x24d3	"i2c-i801"	"Intel Corp.|82801EB SMBus"
+0x8086	0x24d4	"usb-uhci"	"Intel Corp.|USB Controller"
 0x8086	0x24d5	"snd-intel8x0"	"Intel Corp.|82801EB AC'97 Audio"
-0x8086	0x24d6	"unknown"	"Intel Corp.|82801EB AC'97 Modem Controller"
-0x8086	0x24d7	"usb-uhci"	"Intel Corporation|USB Controller"
-0x8086	0x24db	"unknown"	"Intel Corp.|82801EB ICH5 IDE"
+0x8086	0x24d6	"slamr"	"Intel Corp.|82801EB AC'97 Modem Controller"
+0x8086	0x24d7	"usb-uhci"	"Intel Corp.|USB Controller"
+0x8086	0x24db	"ata_piix"	"Intel Corp.|82801EB ICH5 IDE"
 0x8086	0x24dc	"unknown"	"Intel Corp.|82801EB LPC Interface Controller"
-0x8086	0x24dd	"ehci-hcd"	"Intel Corporation|USB Enhanced Controller"
+0x8086	0x24dd	"ehci-hcd"	"Intel Corp.|USB Enhanced Controller"
 0x8086	0x24de	"unknown"	"Intel Corp.|82801EB USB EHCI Controller #2"
 0x8086	0x24df	"ata_piix"	"Intel Corp.|82801ER ICH5 IDE (SATA Raid)"
-0x8086	0x2500	"intel-agp"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge (MCH)"
-0x8086	0x2501	"intel-agp"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge (MCH)"
-0x8086	0x2502	"unknown"	"Intel Corporation|82820"
-0x8086	0x2503	"unknown"	"Intel Corporation|82820"
-0x8086	0x2504	"unknown"	"Intel Corporation|82820"
-0x8086	0x250b	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge"
-0x8086	0x250f	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset PCI to AGP Bridge"
-0x8086	0x2520	"unknown"	"Intel Corporation|82805AA MTH Memory Translator Hub"
-0x8086	0x2521	"unknown"	"Intel Corporation|82804AA MRH-S Memory Repeater Hub for SDRAM"
-0x8086	0x2530	"intel-agp"	"Intel Corporation|82850 850 (Tehama) Chipset Host Bridge (MCH)"
-0x8086	0x2531	"intel-agp"	"Intel Corporation|82860 860 (Wombat) Chipset Host Bridge (MCH)"
-0x8086	0x2532	"unknown"	"Intel Corporation|82850 850 (Tehama) Chipset AGP Bridge"
-0x8086	0x2533	"unknown"	"Intel Corporation|82860 860 (Wombat) Chipset AGP Bridge"
-0x8086	0x2534	"unknown"	"Intel Corporation|82860 Hub Interface_C Bridge"
-0x8086	0x2535	"unknown"	"Intel Corporation|82860 PCI Bridge"
-0x8086	0x2536	"unknown"	"Intel Corporation|82860 PCI Bridge"
-0x8086	0x2537	"unknown"	"Intel Corporation|82850/82860 (i850/i860) Controller"
-0x8086	0x2539	"unknown"	"Intel Corporation|82860 (Quad Processor mode)"
-0x8086	0x2540	"unknown"	"Intel Corporation|E7500 DRAM Controller"
-0x8086	0x2541	"unknown"	"Intel Corporation|E7500 DRAM Controller Error Reporting"
-0x8086	0x2543	"unknown"	"Intel Corporation|E7500 HI_B Virtual PCI-to-PCI Bridge (F0)"
-0x8086	0x2544	"unknown"	"Intel Corporation|E7500 HI_B Virtual PCI-to-PCI Bridge (F1)"
-0x8086	0x2545	"unknown"	"Intel Corporation|E7500 HI_C Virtual PCI-to-PCI Bridge (F0)"
-0x8086	0x2546	"unknown"	"Intel Corporation|E7500 HI_C Virtual PCI-to-PCI Bridge (F1)"
-0x8086	0x2547	"unknown"	"Intel Corporation|E7500 HI_D Virtual PCI-to-PCI Bridge (F0)"
-0x8086	0x2548	"unknown"	"Intel Corporation|E7500 HI_D Virtual PCI-to-PCI Bridge (F1)"
-0x8086	0x254c	"unknown"	"Intel Corporation|E7501 Host Controller"
-0x8086	0x2550	"intel-agp"	"Intel Corporation|E7505 Host Controller"
-0x8086	0x2551	"unknown"	"Intel Corporation|E7205/E7505 Host RAS Controller"
-0x8086	0x2552	"unknown"	"Intel Corporation|E7205/E7505 PCI-to-AGP Bridge"
-0x8086	0x2553	"unknown"	"Intel Corporation|E7505 Hub Interface_B PCI-to-PCI Bridge"
-0x8086	0x2554	"unknown"	"Intel Corporation|E7505 Hub I/F_B PCI-to-PCI Bridge Error Report"
-0x8086	0x255d	"intel-agp"	"Intel Corporation|E7205 Host Controller"
-0x8086	0x2560	"intel-agp"	"Intel Corporation|82845 845 Chipset Host Bridge (MCH)"
+0x8086	0x2500	"intel-agp"	"Intel Corp.|82820 820 (Camino) Chipset Host Bridge (MCH)"
+0x8086	0x2501	"intel-agp"	"Intel Corp.|82820 820 (Camino) Chipset Host Bridge (MCH)"
+0x8086	0x2502	"unknown"	"Intel Corp.|82820"
+0x8086	0x2503	"unknown"	"Intel Corp.|82820"
+0x8086	0x2504	"unknown"	"Intel Corp.|82820"
+0x8086	0x250b	"unknown"	"Intel Corp.|82820 820 (Camino) Chipset Host Bridge"
+0x8086	0x250f	"unknown"	"Intel Corp.|82820 820 (Camino) Chipset PCI to AGP Bridge"
+0x8086	0x2520	"unknown"	"Intel Corp.|82805AA MTH Memory Translator Hub"
+0x8086	0x2521	"unknown"	"Intel Corp.|82804AA MRH-S Memory Repeater Hub for SDRAM"
+0x8086	0x2530	"intel-agp"	"Intel Corp.|82850 850 (Tehama) Chipset Host Bridge (MCH)"
+0x8086	0x2531	"intel-agp"	"Intel Corp.|82860 860 (Wombat) Chipset Host Bridge (MCH)"
+0x8086	0x2532	"unknown"	"Intel Corp.|82850 850 (Tehama) Chipset AGP Bridge"
+0x8086	0x2533	"unknown"	"Intel Corp.|82860 860 (Wombat) Chipset AGP Bridge"
+0x8086	0x2534	"unknown"	"Intel Corp.|82860 Hub Interface_C Bridge"
+0x8086	0x2535	"unknown"	"Intel Corp.|82860 PCI Bridge"
+0x8086	0x2536	"unknown"	"Intel Corp.|82860 PCI Bridge"
+0x8086	0x2537	"unknown"	"Intel Corp.|82850/82860 (i850/i860) Controller"
+0x8086	0x2539	"unknown"	"Intel Corp.|82860 (Quad Processor mode)"
+0x8086	0x2540	"unknown"	"Intel Corp.|E7500 DRAM Controller"
+0x8086	0x2541	"unknown"	"Intel Corp.|E7500 DRAM Controller Error Reporting"
+0x8086	0x2543	"unknown"	"Intel Corp.|E7500 HI_B Virtual PCI-to-PCI Bridge (F0)"
+0x8086	0x2544	"unknown"	"Intel Corp.|E7500 HI_B Virtual PCI-to-PCI Bridge (F1)"
+0x8086	0x2545	"unknown"	"Intel Corp.|E7500 HI_C Virtual PCI-to-PCI Bridge (F0)"
+0x8086	0x2546	"unknown"	"Intel Corp.|E7500 HI_C Virtual PCI-to-PCI Bridge (F1)"
+0x8086	0x2547	"unknown"	"Intel Corp.|E7500 HI_D Virtual PCI-to-PCI Bridge (F0)"
+0x8086	0x2548	"unknown"	"Intel Corp.|E7500 HI_D Virtual PCI-to-PCI Bridge (F1)"
+0x8086	0x254c	"unknown"	"Intel Corp.|E7501 Host Controller"
+0x8086	0x2550	"intel-agp"	"Intel Corp.|E7505 Host Controller"
+0x8086	0x2551	"unknown"	"Intel Corp.|E7205/E7505 Host RAS Controller"
+0x8086	0x2552	"unknown"	"Intel Corp.|E7205/E7505 PCI-to-AGP Bridge"
+0x8086	0x2553	"unknown"	"Intel Corp.|E7505 Hub Interface_B PCI-to-PCI Bridge"
+0x8086	0x2554	"unknown"	"Intel Corp.|E7505 Hub I/F_B PCI-to-PCI Bridge Error Report"
+0x8086	0x255d	"intel-agp"	"Intel Corp.|E7205 Host Controller"
+0x8086	0x2560	"intel-agp"	"Intel Corp.|82845 845 Chipset Host Bridge (MCH)"
 0x8086	0x2561	"unknown"	"Intel Corp.|82845G/GL [Brookdale-G] Chipset AGP Bridge"
-0x8086	0x2562	"Card:Intel 845"	"Intel Corporation|82845 CGC [Chipset Graphics Controller]"
+0x8086	0x2562	"Card:Intel 845"	"Intel Corp.|82845 CGC [Chipset Graphics Controller]"
 0x8086	0x2570	"intel-agp"	"Intel Corp.|82865G [Springdale-G] Chipset Host Bridge"
 0x8086	0x2571	"unknown"	"Intel Corp.|82865G/PE/P Processor to AGP Controller"
-0x8086	0x2572	"Card:Intel 865"	"Intel Corporation|865 Chipset Graphics Controller"
+0x8086	0x2572	"Card:Intel 865"	"Intel Corp.|865 Chipset Graphics Controller"
 0x8086	0x2573	"unknown"	"Intel Corp.|82865G/PE/P Processor to PCI to CSA Bridge"
 0x8086	0x2576	"unknown"	"Intel Corp.|82864G/PE/P Processor to I/O Memory Interface"
-0x8086	0x2578	"intel-agp"	"Intel Corporation|875 DRAM Controller / Host-Hub Interface"
-0x8086	0x2579	"unknown"	"Intel Corporation|875 Host-AGP Bridge"
-0x8086	0x257a	"unknown"	"Intel Corporation| "
+0x8086	0x2578	"intel-agp"	"Intel Corp.|875 DRAM Controller / Host-Hub Interface"
+0x8086	0x2579	"unknown"	"Intel Corp.|875 Host-AGP Bridge"
+0x8086	0x257a	"unknown"	"Intel Corp.| "
 0x8086	0x257b	"unknown"	"Intel Corp.|82875P Processor to PCI to CSA Bridge"
 0x8086	0x257e	"unknown"	"Intel Corp.|82875P Processor to I/O Memory Interface"
 0x8086	0x2580	"unknown"	"Intel Corp.|Memory Controller Hub"
@@ -5072,24 +5617,62 @@
 0x8086	0x2588	"unknown"	"Intel Corp.|Server Memory Controller Hub"
 0x8086	0x2589	"unknown"	"Intel Corp.|Server Memory Controller Hub PCI Express Port"
 0x8086	0x258a	"unknown"	"Intel Corp.|Graphics Controller"
+0x8086	0x2590	"unknown"	"Intel Corp.|Mobile Memory Controller Hub"
+0x8086	0x2591	"unknown"	"Intel Corp.|Mobile Memory Controller Hub PCI Express Port"
+0x8086	0x2592	"unknown"	"Intel Corp.|Mobile Graphics Controller"
 0x8086	0x25a1	"unknown"	"Intel Corp.|Enterprise Southbridge ISA Bridge"
-0x8086	0x25a2	"unknown"	"Intel Corp.|Enterprise Southbridge PATA"
+0x8086	0x25a2	"ata_piix"	"Intel Corp.|Enterprise Southbridge PATA"
 0x8086	0x25a3	"ata_piix"	"Intel Corp.|IDE (SATA)"
-0x8086	0x25a4	"unknown"	"Intel Corp.|Enterprise Southbridge SMBUS"
+0x8086	0x25a4	"i2c-i801"	"Intel Corp.|Enterprise Southbridge SMBUS"
 0x8086	0x25a6	"i810_audio"	"Intel Corp.|Enterprise Southbridge AC'97 Audio"
 0x8086	0x25a7	"unknown"	"Intel Corp.|Enterprise Southbridge AC'97 Modem"
-0x8086	0x25a9	"unknown"	"Intel Corp.|Enterprise Southbridge USB 1.1 UHCI"
-0x8086	0x25aa	"unknown"	"Intel Corp.|Enterprise Southbridge USB 1.1 UHCI"
+0x8086	0x25a9	"usb-uhci"	"Intel Corp.|Enterprise Southbridge USB 1.1 UHCI"
+0x8086	0x25aa	"usb-uhci"	"Intel Corp.|Enterprise Southbridge USB 1.1 UHCI"
 0x8086	0x25ab	"unknown"	"Intel Corp.|Enterprise Southbridge Watchdog Timer"
 0x8086	0x25ac	"unknown"	"Intel Corp.|Enterprise Southbridge IOxAPIC"
-0x8086	0x25ad	"unknown"	"Intel Corp.|Enterprise Southbridge USB 2.0 EHCI"
+0x8086	0x25ad	"ehci-hcd"	"Intel Corp.|Enterprise Southbridge USB 2.0 EHCI"
 0x8086	0x25ae	"unknown"	"Intel Corp.|Enterprise Southbridge Hublink PCI-X Bridge"
 0x8086	0x25b0	"ata_piix"	"Intel Corp.|IDE (SATA)"
+0x8086	0x2600	"unknown"	"Intel Corp.|Server Hub Interface"
+0x8086	0x2601	"unknown"	"Intel Corp.|Server Hub PCI Express x4 Port D"
+0x8086	0x2602	"unknown"	"Intel Corp.|Server Hub PCI Express x4 Port C0"
+0x8086	0x2603	"unknown"	"Intel Corp.|Server Hub PCI Express x4 Port C1"
+0x8086	0x2604	"unknown"	"Intel Corp.|Server Hub PCI Express x4 Port B0"
+0x8086	0x2605	"unknown"	"Intel Corp.|Server Hub PCI Express x4 Port B1"
+0x8086	0x2606	"unknown"	"Intel Corp.|Server Hub PCI Express x4 Port A0"
+0x8086	0x2607	"unknown"	"Intel Corp.|Server Hub PCI Express x4 Port A1"
+0x8086	0x2608	"unknown"	"Intel Corp.|Server Hub PCI Express x8 Port C"
+0x8086	0x2609	"unknown"	"Intel Corp.|Server Hub PCI Express x8 Port B"
+0x8086	0x260a	"unknown"	"Intel Corp.|Server Hub PCI Express x8 Port A"
+0x8086	0x260c	"unknown"	"Intel Corp.|Server Hub IMI Registers"
+0x8086	0x2610	"unknown"	"Intel Corp.|Server Hub System Bus, Boot, and Interrupt Registers"
+0x8086	0x2611	"unknown"	"Intel Corp.|Server Hub Address Mapping Registers"
+0x8086	0x2612	"unknown"	"Intel Corp.|Server Hub RAS Registers"
+0x8086	0x2613	"unknown"	"Intel Corp.|Server Hub Performance Monitoring Registers"
+0x8086	0x2614	"unknown"	"Intel Corp.|Server Hub Performance Monitoring Registers"
+0x8086	0x2615	"unknown"	"Intel Corp.|Server Hub Performance Monitoring Registers"
+0x8086	0x2617	"unknown"	"Intel Corp.|Server Hub Debug Registers"
+0x8086	0x2618	"unknown"	"Intel Corp.|Server Hub Debug Registers"
+0x8086	0x2619	"unknown"	"Intel Corp.|Server Hub Debug Registers"
+0x8086	0x261a	"unknown"	"Intel Corp.|Server Hub Debug Registers"
+0x8086	0x261b	"unknown"	"Intel Corp.|Server Hub Debug Registers"
+0x8086	0x261c	"unknown"	"Intel Corp.|Server Hub Debug Registers"
+0x8086	0x261d	"unknown"	"Intel Corp.|Server Hub Debug Registers"
+0x8086	0x261e	"unknown"	"Intel Corp.|Server Hub Debug Registers"
+0x8086	0x2620	"unknown"	"Intel Corp.|External Memory Bridge"
+0x8086	0x2621	"unknown"	"Intel Corp.|External Memory Bridge Control Registers"
+0x8086	0x2622	"unknown"	"Intel Corp.|External Memory Bridge Memory Interleaving Registers"
+0x8086	0x2623	"unknown"	"Intel Corp.|External Memory Bridge DDR Initialization and Calibration"
+0x8086	0x2624	"unknown"	"Intel Corp.|External Memory Bridge Reserved Registers"
+0x8086	0x2625	"unknown"	"Intel Corp.|External Memory Bridge Reserved Registers"
+0x8086	0x2626	"unknown"	"Intel Corp.|External Memory Bridge Reserved Registers"
+0x8086	0x2627	"unknown"	"Intel Corp.|External Memory Bridge Reserved Registers"
 0x8086	0x2640	"unknown"	"Intel Corp.|I/O Controller Hub LPC"
 0x8086	0x2641	"unknown"	"Intel Corp.|I/O Controller Hub LPC"
 0x8086	0x2642	"unknown"	"Intel Corp.|I/O Controller Hub LPC"
-0x8086	0x2651	"ata_piix"	""
-0x8086	0x2652	"ata_piix"	""
+0x8086	0x2651	"ata_piix"	"Intel Corp.|82801FB/FW (ICH6/ICH6W) SATA Controller"
+0x8086	0x2652	"ata_piix"	"Intel Corp.|82801FR/FRW (ICH6R/ICH6RW) SATA Controller"
+0x8086	0x2653	"ata_piix"	"Intel Corp.|82801FBM (ICH6M) SATA Controller"
 0x8086	0x2658	"unknown"	"Intel Corp.|I/O Controller Hub USB"
 0x8086	0x2659	"unknown"	"Intel Corp.|I/O Controller Hub USB"
 0x8086	0x265a	"unknown"	"Intel Corp.|I/O Controller Hub USB"
@@ -5100,27 +5683,29 @@
 0x8086	0x2664	"unknown"	"Intel Corp.|I/O Controller Hub PCI Express Port 2"
 0x8086	0x2666	"unknown"	"Intel Corp.|I/O Controller Hub PCI Express Port 3"
 0x8086	0x2668	"unknown"	"Intel Corp.|I/O Controller Hub Audio"
-0x8086	0x266a	"unknown"	"Intel Corp.|I/O Controller Hub SMBus"
+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	"unknown"	"Intel Corp.|I/O Controller Hub Modem"
-0x8086	0x266e	"i810_audio"	""
+0x8086	0x266e	"snd-intel8x0"	"Intel Corp.|82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Audio Controller"
 0x8086	0x266f	"unknown"	"Intel Corp.|I/O Controller Hub PATA"
 0x8086	0x2782	"unknown"	"Intel Corp.|Graphics Controller"
-0x8086	0x3092	"i2o_block"	"Intel Corporation|Integrated RAID"
-0x8086	0x3200	"unknown"	"Intel Corporation|31244 PCI-X to Serial ATA Controller"
+0x8086	0x2792	"unknown"	"Intel Corp.|Mobile 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"
 0x8086	0x3341	"unknown"	"Intel Corp.|82855PM Processor to AGP Controller"
-0x8086	0x3342	"unknown"	"Intel Corporation|82855PM Power Management"
-0x8086	0x3575	"intel-agp"	"Intel Corporation|82830 Host-Hub I/F Bridge SDRAM Controller"
-0x8086	0x3576	"unknown"	"Intel Corporation|82830 Host-AGP Bridge"
-0x8086	0x3577	"Card:Intel 830"	"Intel Corporation|82830 CGC Integrated Graphics Device"
-0x8086	0x3578	"unknown"	"Intel Corporation|82830 CPU to I/O Bridge"
-0x8086	0x3579	"unknown"	"Intel Corporation|82835 SDRAM Controller / Host-hub Interface"
-0x8086	0x357b	"unknown"	"Intel Corporation|82835 Integrated Graphics Device"
-0x8086	0x3580	"intel-agp"	"Intel Corporation|852GM Host-Hub Interface Bridge"
-0x8086	0x3581	"unknown"	"Intel Corporation|82852GME/PM Virtual PCI to AGP Bridge"
-0x8086	0x3582	"Card:Intel 85x"	"Intel Corporation|852GM/852GME/855GM/855GME Chipset Graphics Controller"
-0x8086	0x3584	"unknown"	"Intel Corporation|852GM System Memory Controller"
-0x8086	0x3585	"unknown"	"Intel Corporation|852GM Configuration Process"
+0x8086	0x3342	"unknown"	"Intel Corp.|82855PM Power Management"
+0x8086	0x3575	"intel-agp"	"Intel Corp.|82830 Host-Hub I/F Bridge SDRAM Controller"
+0x8086	0x3576	"unknown"	"Intel Corp.|82830 Host-AGP Bridge"
+0x8086	0x3577	"Card:Intel 830"	"Intel Corp.|82830 CGC Integrated Graphics Device"
+0x8086	0x3578	"unknown"	"Intel Corp.|82830 CPU to I/O Bridge"
+0x8086	0x3579	"unknown"	"Intel Corp.|82835 SDRAM Controller / Host-hub Interface"
+0x8086	0x357b	"unknown"	"Intel Corp.|82835 Integrated Graphics Device"
+0x8086	0x3580	"intel-agp"	"Intel Corp.|852GM Host-Hub Interface Bridge"
+0x8086	0x3581	"unknown"	"Intel Corp.|82852GME/PM Virtual PCI to AGP Bridge"
+0x8086	0x3582	"Card:Intel 85x"	"Intel Corp.|852GM/852GME/855GM/855GME Chipset Graphics Controller"
+0x8086	0x3584	"unknown"	"Intel Corp.|852GM System Memory Controller"
+0x8086	0x3585	"unknown"	"Intel Corp.|852GM Configuration Process"
 0x8086	0x3590	"unknown"	"Intel Corp.|Server Memory Controller Hub"
 0x8086	0x3591	"unknown"	"Intel Corp.|Memory Controller Hub Error Reporting Register"
 0x8086	0x3592	"unknown"	"Intel Corp.|Server Memory Controller Hub"
@@ -5134,93 +5719,100 @@
 0x8086	0x359a	"unknown"	"Intel Corp.|Memory Controller Hub PCI Express Port C1"
 0x8086	0x359b	"unknown"	"Intel Corp.|Memory Controller Hub Extended Configuration Registers"
 0x8086	0x359e	"unknown"	"Intel Corp.|Workstation Memory Controller Hub"
-0x8086	0x4000	"unknown"	"Intel Corporation|Creatix V.90 HaM Modem"
-0x8086	0x4220	"unknown"	"Intel Corp.|Intel(R) PRO/Wireless 2200BG"
-0x8086	0x5001	"unknown"	"Intel Corporation|PRO/DSL 2100 Modem - PPP"
-0x8086	0x5005	"unknown"	"Intel Corporation|PRO/DSL 2200 Modem - PPPoA"
-0x8086	0x5200	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
-0x8086	0x5201	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
-0x8086	0x5309	"unknown"	"Intel Corporation|80303 I/O Processor Address Translation Unit"
-0x8086	0x530d	"unknown"	"Intel Corporation|80310 IOP [IO Processor]"
-0x8086	0x6960	"unknown"	"Intel Corporation|EHCI 960 emulator"
-0x8086	0x7000	"unknown"	"Intel Corporation|82371SB PIIX3 ISA [Natoma/Triton II]"
-0x8086	0x7010	"unknown"	"Intel Corporation|82371SB PIIX3 IDE [Natoma/Triton II]"
-0x8086	0x7020	"usb-uhci"	"Intel Corporation|82371SB PIIX3 USB [Natoma/Triton II]"
-0x8086	0x7030	"unknown"	"Intel Corporation|430VX - 82437VX TVX [Triton VX]"
+0x8086	0x4000	"unknown"	"Intel Corp.|Creatix V.90 HaM Modem"
+0x8086	0x4220	"ipw2200"	"Intel Corp.|Intel(R) PRO/Wireless 2200BG"
+0x8086	0x4223	"ipw2200"	"Intel Corp.|PRO/Wireless 2915ABG MiniPCI Adapter"
+0x8086	0x4224	"ipw2200"	""
+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"
+0x8086	0x5201	"eepro100"	"Intel Corp.|EtherExpress PRO/100"
+0x8086	0x5309	"unknown"	"Intel Corp.|80303 I/O Processor Address Translation Unit"
+0x8086	0x530d	"unknown"	"Intel Corp.|80310 IOP [IO Processor]"
+0x8086	0x6960	"unknown"	"Intel Corp.|EHCI 960 emulator"
+0x8086	0x7000	"unknown"	"Intel Corp.|82371SB PIIX3 ISA [Natoma/Triton II]"
+0x8086	0x7010	"unknown"	"Intel Corp.|82371SB PIIX3 IDE [Natoma/Triton II]"
+0x8086	0x7020	"usb-uhci"	"Intel Corp.|82371SB PIIX3 USB [Natoma/Triton II]"
+0x8086	0x7030	"unknown"	"Intel Corp.|430VX - 82437VX TVX [Triton VX]"
 0x8086	0x7050	"unknown"	"Intel Corp.|Intel Intercast Video Capture Card"
-0x8086	0x7051	"unknown"	"Intel Corporation|PB 642365-003 Intel Business Video Conferencing Card"
-0x8086	0x7100	"unknown"	"Intel Corporation|430TX - 82439TX MTXC"
-0x8086	0x7110	"unknown"	"Intel Corporation|82371AB PIIX4 ISA"
-0x8086	0x7111	"unknown"	"Intel Corporation|82371AB PIIX4 IDE"
-0x8086	0x7112	"usb-uhci"	"Intel Corporation|82371AB PIIX4 USB"
-0x8086	0x7113	"sonypi"	"Intel Corporation|82371AB PIIX4 ACPI - Bus Master IDE Controller"
-0x8086	0x7120	"intel-agp"	"Intel Corporation|82810 GMCH [Graphics Memory Controller Hub]"
-0x8086	0x7121	"Card:Intel 810"	"Intel Corporation|82810 CGC [Chipset Graphics Controller]"
-0x8086	0x7122	"intel-agp"	"Intel Corporation|82810-DC100 GMCH [Graphics Memory Controller Hub]"
-0x8086	0x7123	"Card:Intel 810"	"Intel Corporation|82810-DC100 CGC [Chipset Graphics Controller]"
-0x8086	0x7124	"intel-agp"	"Intel Corporation|82810E GMCH [Graphics Memory Controller Hub]"
-0x8086	0x7125	"Card:Intel 810"	"Intel Corporation|82810E CGC [Chipset Graphics Controller]"
-0x8086	0x7126	"unknown"	"Intel Corporation|82810 810 Chipset Host Bridge and Memory Controller Hub"
-0x8086	0x7127	"unknown"	"Intel Corporation|82810-DC133 Graphics Device (FSB 133 MHz)"
-0x8086	0x7128	"unknown"	"Intel Corporation|82810-M DC-100 Host Bridge and Memory Controller Hub"
-0x8086	0x712a	"unknown"	"Intel Corporation|82810-M DC-133 Host Bridge and Memory Controller Hub"
-0x8086	0x7180	"intel-agp"	"Intel Corporation|440LX/EX - 82443LX/EX Host bridge"
-0x8086	0x7181	"unknown"	"Intel Corporation|440LX/EX - 82443LX/EX AGP bridge"
-0x8086	0x7182	"unknown"	"Intel Corporation|440LX/EX"
-0x8086	0x7190	"intel-agp"	"Intel Corporation|440BX/ZX - 82443BX/ZX Host bridge"
-0x8086	0x7191	"unknown"	"Intel Corporation|440BX/ZX - 82443BX/ZX AGP bridge"
-0x8086	0x7192	"unknown"	"Intel Corporation|440BX/ZX - 82443BX/ZX Host bridge (AGP disabled)"
+0x8086	0x7051	"unknown"	"Intel Corp.|PB 642365-003 Intel Business Video Conferencing Card"
+0x8086	0x7100	"unknown"	"Intel Corp.|430TX - 82439TX MTXC"
+0x8086	0x7110	"unknown"	"Intel Corp.|82371AB PIIX4 ISA"
+0x8086	0x7111	"ata_piix"	"Intel Corp.|82371AB PIIX4 IDE"
+0x8086	0x7112	"usb-uhci"	"Intel Corp.|82371AB PIIX4 USB"
+0x8086	0x7113	"sonypi"	"Intel Corp.|82371AB PIIX4 ACPI - Bus Master IDE Controller"
+0x8086	0x7120	"intel-agp"	"Intel Corp.|82810 GMCH [Graphics Memory Controller Hub]"
+0x8086	0x7121	"Card:Intel 810"	"Intel Corp.|82810 CGC [Chipset Graphics Controller]"
+0x8086	0x7122	"intel-agp"	"Intel Corp.|82810-DC100 GMCH [Graphics Memory Controller Hub]"
+0x8086	0x7123	"Card:Intel 810"	"Intel Corp.|82810-DC100 CGC [Chipset Graphics Controller]"
+0x8086	0x7124	"intel-agp"	"Intel Corp.|82810E GMCH [Graphics Memory Controller Hub]"
+0x8086	0x7125	"Card:Intel 810"	"Intel Corp.|82810E CGC [Chipset Graphics Controller]"
+0x8086	0x7126	"unknown"	"Intel Corp.|82810 810 Chipset Host Bridge and Memory Controller Hub"
+0x8086	0x7127	"unknown"	"Intel Corp.|82810-DC133 Graphics Device (FSB 133 MHz)"
+0x8086	0x7128	"unknown"	"Intel Corp.|82810-M DC-100 Host Bridge and Memory Controller Hub"
+0x8086	0x712a	"unknown"	"Intel Corp.|82810-M DC-133 Host Bridge and Memory Controller Hub"
+0x8086	0x7180	"intel-agp"	"Intel Corp.|440LX/EX - 82443LX/EX Host bridge"
+0x8086	0x7181	"unknown"	"Intel Corp.|440LX/EX - 82443LX/EX AGP bridge"
+0x8086	0x7182	"unknown"	"Intel Corp.|440LX/EX"
+0x8086	0x7190	"intel-agp"	"Intel Corp.|440BX/ZX - 82443BX/ZX Host bridge"
+0x8086	0x7191	"unknown"	"Intel Corp.|440BX/ZX - 82443BX/ZX AGP bridge"
+0x8086	0x7192	"unknown"	"Intel Corp.|440BX/ZX - 82443BX/ZX Host bridge (AGP disabled)"
 0x8086	0x7194	"unknown"	"Intel|82440MX CPU to I/O Controller"
-0x8086	0x7195	"i810_audio"	"Intel Corporation|440MX 810 Chipset AC'97 Audio Controller"
-0x8086	0x7196	"unknown"	"Intel Corporation|82440 - 443MX AC97 Modem Controller (Winmodem)"
+0x8086	0x7195	"i810_audio"	"Intel Corp.|440MX 810 Chipset AC'97 Audio Controller"
+0x8086	0x7196	"slamr"	"Intel Corp.|82440 - 443MX AC97 Modem Controller (Winmodem)"
 0x8086	0x7198	"unknown"	"Intel|82440MX PCI to ISA Bridge"
 0x8086	0x7199	"unknown"	"Intel|82440MX EIDE Controller"
 0x8086	0x719a	"usb-uhci"	"Intel|82440MX USB Universal Host Controller"
-0x8086	0x719b	"unknown"	"Intel|82440MX Power Management Controller"
-0x8086	0x71a0	"intel-agp"	"Intel Corporation|440GX - 82443GX Host bridge"
-0x8086	0x71a1	"unknown"	"Intel Corporation|440GX - 82443GX AGP bridge"
-0x8086	0x71a2	"unknown"	"Intel Corporation|440GX - 82443GX Host bridge (AGP disabled)"
-0x8086	0x7600	"unknown"	"Intel Corporation|82372FB PCI to ISA Bridge"
-0x8086	0x7601	"unknown"	"Intel Corporation|82372FB PIIX4 IDE"
-0x8086	0x7602	"usb-uhci"	"Intel Corporation|82372FB [PCI-to-USB UHCI]"
-0x8086	0x7603	"unknown"	"Intel Corporation|82372FB System Management Bus Controller"
-0x8086	0x7605	"unknown"	"Intel Corporation|82372FB IEEE1394 OpenHCI Host Controller"
-0x8086	0x7800	"Card:Intel 740 (generic)"	"Intel Corporation|i740"
-0x8086	0x84c4	"unknown"	"Intel Corporation|450KX/GX [Orion] - 82454KX/GX PCI bridge"
-0x8086	0x84c5	"unknown"	"Intel Corporation|450KX/GX [Orion] - 82453KX/GX Memory controller"
-0x8086	0x84ca	"unknown"	"Intel Corporation|450NX - 82451NX Memory & I/O Controller"
-0x8086	0x84cb	"unknown"	"Intel Corporation|450NX - 82454NX PCI Expander Bridge"
-0x8086	0x84e0	"unknown"	"Intel Corporation|460GX - 84460GX System Address Controller (SAC)"
-0x8086	0x84e1	"unknown"	"Intel Corporation|460GX - 84460GX System Data Controller (SDC)"
-0x8086	0x84e2	"unknown"	"Intel Corporation|460GX - 84460GX AGP Bridge (GXB)"
-0x8086	0x84e3	"unknown"	"Intel Corporation|460GX - 84460GX Memory Address Controller (MAC)"
-0x8086	0x84e4	"unknown"	"Intel Corporation|460GX - 84460GX Memory Data Controller (MDC)"
-0x8086	0x84e6	"unknown"	"Intel Corporation|460GX - 82466GX Wide and fast PCI eXpander Bridge (WXB)"
+0x8086	0x719b	"i2c-piix4"	"Intel|82440MX Power Management Controller"
+0x8086	0x71a0	"intel-agp"	"Intel Corp.|440GX - 82443GX Host bridge"
+0x8086	0x71a1	"unknown"	"Intel Corp.|440GX - 82443GX AGP bridge"
+0x8086	0x71a2	"unknown"	"Intel Corp.|440GX - 82443GX Host bridge (AGP disabled)"
+0x8086	0x7600	"unknown"	"Intel Corp.|82372FB PCI to ISA Bridge"
+0x8086	0x7601	"unknown"	"Intel Corp.|82372FB PIIX4 IDE"
+0x8086	0x7602	"usb-uhci"	"Intel Corp.|82372FB [PCI-to-USB UHCI]"
+0x8086	0x7603	"unknown"	"Intel Corp.|82372FB System Management Bus Controller"
+0x8086	0x7605	"unknown"	"Intel Corp.|82372FB IEEE1394 OpenHCI Host Controller"
+0x8086	0x7800	"Card:Intel 740 (generic)"	"Intel Corp.|i740"
+0x8086	0x84c4	"unknown"	"Intel Corp.|450KX/GX [Orion] - 82454KX/GX PCI bridge"
+0x8086	0x84c5	"unknown"	"Intel Corp.|450KX/GX [Orion] - 82453KX/GX Memory controller"
+0x8086	0x84ca	"unknown"	"Intel Corp.|450NX - 82451NX Memory & I/O Controller"
+0x8086	0x84cb	"unknown"	"Intel Corp.|450NX - 82454NX PCI Expander Bridge"
+0x8086	0x84e0	"unknown"	"Intel Corp.|460GX - 84460GX System Address Controller (SAC)"
+0x8086	0x84e1	"unknown"	"Intel Corp.|460GX - 84460GX System Data Controller (SDC)"
+0x8086	0x84e2	"unknown"	"Intel Corp.|460GX - 84460GX AGP Bridge (GXB)"
+0x8086	0x84e3	"unknown"	"Intel Corp.|460GX - 84460GX Memory Address Controller (MAC)"
+0x8086	0x84e4	"unknown"	"Intel Corp.|460GX - 84460GX Memory Data Controller (MDC)"
+0x8086	0x84e6	"unknown"	"Intel Corp.|460GX - 82466GX Wide and fast PCI eXpander Bridge (WXB)"
 0x8086	0x84ea	"i460-agp"	"Intel Corp.|460GX - 84460GX AGP Bridge (GXB function 1)"
 0x8086	0x8500	"unknown"	"Intel Corp.|IXP4XX - Intel Network Processor family. IXP420, IXP421, IXP422, IXP425 and IXC1100"
-0x8086	0x8671	"unknown"	"Intel Corporation| "
+0x8086	0x8671	"unknown"	"Intel Corp.| "
 0x8086	0x9000	"unknown"	"Intel Corp.|Intel IXP2000 Familly Network Processor"
-0x8086	0x9620	"unknown"	"Intel Corporation|I2O RAID PCI to PCI Bridge"
-0x8086	0x9621	"i2o_block"	"Intel Corporation|Integrated RAID"
-0x8086	0x9622	"i2o_block"	"Intel Corporation|Integrated RAID"
-0x8086	0x9641	"i2o_block"	"Intel Corporation|Integrated RAID"
-0x8086	0x96a1	"i2o_block"	"Intel Corporation|Integrated RAID"
-0x8086	0xb152	"unknown"	"Intel Corporation|S21152BB PCI to PCI Bridge"
-0x8086	0xb154	"unknown"	"Intel Corporation|S21154AE/BE PCI to PCI Bridge"
-0x8086	0xb555	"umem"	"Intel Corporation|21555 Non-Transparent PCI-to-PCI Bridge"
-0x8086	0xffff	"unknown"	"Intel Corporation|450NX/GX [Orion] - 82453KX/GX Memory controller [BUG]"
+0x8086	0x9001	"unknown"	"Intel Corp.|IXP2400 Network Processor"
+0x8086	0x9004	"unknown"	"Intel Corp.|IXP2800 Network Processor"
+0x8086	0x9620	"unknown"	"Intel Corp.|I2O RAID PCI to PCI Bridge"
+0x8086	0x9621	"i2o_block"	"Intel Corp.|Integrated RAID"
+0x8086	0x9622	"i2o_block"	"Intel Corp.|Integrated RAID"
+0x8086	0x9641	"i2o_block"	"Intel Corp.|Integrated RAID"
+0x8086	0x96a1	"i2o_block"	"Intel Corp.|Integrated RAID"
+0x8086	0xa01f	"unknown"	"Intel Corp.|PRO/10GbE LR Server Adapter"
+0x8086	0xa11f	"unknown"	"Intel Corp.|PRO/10GbE LR Server Adapter"
+0x8086	0xb152	"unknown"	"Intel Corp.|S21152BB PCI to PCI Bridge"
+0x8086	0xb154	"unknown"	"Intel Corp.|S21154AE/BE PCI to PCI Bridge"
+0x8086	0xb555	"umem"	"Intel Corp.|21555 Non-Transparent PCI-to-PCI Bridge"
+0x8086	0xffff	"unknown"	"Intel Corp.|450NX/GX [Orion] - 82453KX/GX Memory controller [BUG]"
 0x80ff	0x1230	"unknown"	"Intel - Buggy BIOS!!!|82338/82371FB Triton PIIX PCI EIDE"
 0x8800	0x2008	"unknown"	"Trigem Computer Inc.|Video assistent component"
-0x8c4a	0x1980	"ne2k-pci"	""
+0x8c4a	0x1980	"ne2k-pci"	"Winbond|W89C940 misprogrammed [ne2k]"
+0x8e0e	0x0302	"8250_pci"	""
 0x8e2e	0x3000	"ne2k-pci"	"KTI|ET32P2"
-0x9004	0x0010	"unknown"	"Adaptec|2940U2"
-0x9004	0x0078	"unknown"	"Adaptec|aic-7880p AHA-2940UW/CN"
+0x9004	0x0010	"aic7xxx"	"Adaptec|2940U2"
+0x9004	0x0078	"aic7xxx"	"Adaptec|aic-7880p AHA-2940UW/CN"
 0x9004	0x1078	"aic7xxx"	"Adaptec|AIC-7810"
-0x9004	0x1160	"unknown"	"Adaptec|AIC-1160 [Family Fiber Channel Adapter]"
+0x9004	0x1160	"aic7xxx"	"Adaptec|AIC-1160 [Family Fiber Channel Adapter]"
 0x9004	0x2178	"aic7xxx"	"Adaptec|AIC-7821"
 0x9004	0x3860	"aic7xxx"	"Adaptec|AHA-2930CU"
-0x9004	0x3b60	"unknown"	"Adaptec|AHA-2930CU PCI SCSI Controller"
-0x9004	0x3b78	"unknown"	"Adaptec|AHA-4844W/4844UW"
+0x9004	0x3b60	"aic7xxx"	"Adaptec|AHA-2930CU PCI SCSI Controller"
+0x9004	0x3b78	"aic7xxx"	"Adaptec|AHA-4844W/4844UW"
 0x9004	0x5075	"aic7xxx"	"Adaptec|AIC-755x"
 0x9004	0x5078	"aic7xxx"	"Adaptec|AHA-7850"
 0x9004	0x5175	"aic7xxx"	"Adaptec|AIC-755x"
@@ -5312,14 +5904,17 @@
 0x9005	0x00c0	"aic7xxx"	"Adaptec|7899A"
 0x9005	0x00c1	"aic7xxx"	"Adaptec|7899B"
 0x9005	0x00c3	"aic7xxx"	"Adaptec|7899D"
-0x9005	0x00c5	"unknown"	"Adaptec|RAID subsystem HBA"
+0x9005	0x00c5	"aic79xx"	"Adaptec|RAID subsystem HBA"
 0x9005	0x00cf	"aic7xxx"	"Adaptec|7899P"
+0x9005	0x0250	0x1014	0x0279	"aacraid"	"Adaptec| Marco"
+0x9005	0x0250	0x1014	0x028c	"aacraid"	"Adaptec| Sebring"
 0x9005	0x0250	"ips"	"Adaptec|ServeRAID Controller"
-0x9005	0x0258	"unknown"	"Adaptec|AAC-RAID RAID Controller"
+0x9005	0x0258	"aic79xx"	"Adaptec|AAC-RAID RAID Controller"
+0x9005	0x0279	"aic79xx"	"Adaptec|ServeRAID 6M"
 0x9005	0x0283	"aacraid"	"Adaptec|AAC RAID"
 0x9005	0x0284	"aacraid"	"Adaptec|AAC RAID"
 0x9005	0x0285	"aacraid"	"Adaptec|AAC RAID"
-0x9005	0x0286	"aacraid"	""
+0x9005	0x0286	"aacraid"	"Adaptec|AAC-RAID (Rocket)"
 0x9005	0x1364	"aacraid"	"Adaptec|Dell PowerEdge RAID Controller 2"
 0x9005	0x1365	"aacraid"	"Adaptec|Dell PowerEdge RAID Controller 2"
 0x9005	0x8000	"aic79xx"	"Adaptec|29320A"
@@ -5329,10 +5924,10 @@
 0x9005	0x8012	"aic79xx"	"Adaptec|29320"
 0x9005	0x8013	"aic79xx"	"Adaptec|29320B"
 0x9005	0x8014	"aic79xx"	"Adaptec|29320LP"
-0x9005	0x8015	"unknown"	"Adaptec|ASC-39320B U320"
-0x9005	0x8016	"unknown"	"Adaptec|ASC-39320A U320"
-0x9005	0x8017	"unknown"	"Adaptec|ASC-29320ALP U320"
-0x9005	0x801c	"unknown"	"Adaptec Inc|AIC-????? Ultra320 SCSI Controller"
+0x9005	0x8015	"aic79xx"	"Adaptec|ASC-39320B U320"
+0x9005	0x8016	"aic79xx"	"Adaptec|ASC-39320A U320"
+0x9005	0x8017	"aic79xx"	"Adaptec|ASC-29320ALP U320"
+0x9005	0x801c	"aic79xx"	"Adaptec Inc|AIC-????? Ultra320 SCSI Controller"
 0x9005	0x801d	"aic79xx"	"Adaptec|AIC-7901A U320"
 0x9005	0x801e	"aic79xx"	"Adaptec|7901A"
 0x9005	0x801f	"aic79xx"	"Adaptec|7902"
@@ -5370,6 +5965,7 @@
 0x9902	0x0002	"unknown"	"StarGen, Inc.|SG2010 PCI to high speed serial bridge"
 0x9902	0x0003	"unknown"	"StarGen, Inc.|SG1010 6 port serial switch /PCI-to-PCI bridge"
 0xa0a0	0x3058	"unknown"	"AOPEN Inc.|VT82C686 AC97 Audio Controller?"
+0xa727	0x0013	"ath_pci"	"3Com Corp.|"
 0xaa42	0x03a3	"unknown"	"Scitex Digital Video|9400-0931 CharKey"
 0xb00c	0x001c	"unknown"	"IC Book Labs|IC80+PCI POST Diagnostics Card"
 0xb00c	0x061c	"unknown"	"IC Book Labs|IC 138 PCI"
@@ -5404,13 +6000,13 @@
 0xeace	0x4220	"unknown"	"Endace Measurement Systems, Ltd|DAG 4.2 OC-48"
 0xeace	0x422e	"unknown"	"Endace Measurement Systems, Ltd|DAG 4.2E Dual Gigabit Ethernet"
 0xec80	0xec00	"orinoco_plx"	"Belkin|Belkin F5D6000"
-0xecc0	0x0050	"unknown"	"Echo Digital Audio Corporation|Gina24_301"
-0xecc0	0x0051	"unknown"	"Echo Digital Audio Corporation|Gina24_361"
-0xecc0	0x0060	"unknown"	"Echo Digital Audio Corporation|Layla24"
-0xecc0	0x0070	"unknown"	"Echo Digital Audio Corporation|Mona_301_80"
-0xecc0	0x0071	"unknown"	"Echo Digital Audio Corporation|Mona_301_66"
-0xecc0	0x0072	"unknown"	"Echo Digital Audio Corporation|Mona_361"
-0xecc0	0x0080	"unknown"	"Echo Digital Audio Corporation|Mia"
+0xecc0	0x0050	"unknown"	"Echo Digital Audio Corp.|Gina24_301"
+0xecc0	0x0051	"unknown"	"Echo Digital Audio Corp.|Gina24_361"
+0xecc0	0x0060	"unknown"	"Echo Digital Audio Corp.|Layla24"
+0xecc0	0x0070	"unknown"	"Echo Digital Audio Corp.|Mona_301_80"
+0xecc0	0x0071	"unknown"	"Echo Digital Audio Corp.|Mona_301_66"
+0xecc0	0x0072	"unknown"	"Echo Digital Audio Corp.|Mona_361"
+0xecc0	0x0080	"unknown"	"Echo Digital Audio Corp.|Mia"
 0xedd8	0xa091	"Card:Ark Logic ARK1000PV (generic)"	"ARK Logic Inc|1000PV [Stingray]"
 0xedd8	0xa099	"Card:Ark Logic ARK2000MT (generic)"	"ARK Logic Inc|2000PV [Stingray]"
 0xedd8	0xa0a1	"Card:Ark Logic ARK2000MT (generic)"	"ARK Logic Inc|2000MT"
@@ -5428,4 +6024,3 @@
 0xfffe	0x0405	"unknown"	"VMWare Inc|Virtual SVGA 4.0"
 0xfffe	0x0710	"unknown"	"VMWare|Virtual SVGA"
 0xffff	0x8139	"8139too"	"RealTek|RTL-8139 Fast Ethernet"
-0xffff	0xffff	"usb-uhci"	""
diff --git a/lst/pcitable.ppc64 b/lst/pcitable.ppc64
new file mode 100644
index 00000000..6dbba9ba
--- /dev/null
+++ b/lst/pcitable.ppc64
@@ -0,0 +1,6 @@
+0x10df	0xf0a5	"lpfc"	"Emulex Corp.|LP1050 Fibre Channel Host Adapter"
+0x10df	0xf700	"lpfc"	"Emulex Corp.|LP7000 Fibre Channel Host Adapter"
+0x10df	0xf800	"lpfc"	"Emulex Corp.|LP8000 Fibre Channel Host Adapter"
+0x10df	0xf900	"lpfc"	"Emulex Corp.|LP9000 Fibre Channel Host Adapter"
+0x10df	0xf980	"lpfc"	"Emulex Corp.|LP9802 Fibre Channel Host Adapter"
+0x10df	0xfa00	"lpfc"	"Emulex Corp.|LP10000 Fibre Channel Adapter"
diff --git a/lst/usbtable b/lst/usbtable
index 5daeada4..96ad7697 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -222,10 +222,12 @@
 0x0461	0x4d02	"unknown"	"Primax Electronics|Mouse-in-a-Box"
 0x0461	0x4d03	"unknown"	"Primax Electronics|Kensington Mouse-in-a-box"
 0x0461	0x4d04	"unknown"	"Primax Electronics|Mouse"
-0x0463	0x0001	"unknown"	"MGE UPS Systems|UPS"
-0x0463	0xffff	"unknown"	"MGE UPS Systems|Ellipse UPS"
+0x0463	0x0001	"UPS:newhidups"	"MGE UPS Systems|UPS"
+0x0463	0xffff	"UPS:newhidups"	"MGE UPS Systems|Ellipse UPS"
 0x046a	0x0001	"unknown"	"Cherry Mikroschalter GmbH|My3000 Keyboard"
 0x046a	0x0003	"unknown"	"Cherry Mikroscholter GmbH|MY3000 Keyboard+Hub"
+0x046a	0x0010	"smartcard:cmok_ccid"	"Cherry Mikroscholter GmbH|SmartBoard X44"
+0x046a	0x002d	"smartcard:cmok_ccid"	"Cherry Mikroscholter GmbH|Smart Terminal X44"
 0x046d	0x0203	"unknown"	"Logitech Inc.|M2452 keyboard"
 0x046d	0x0301	"unknown"	"Logitech Inc.|M4848 mouse"
 0x046d	0x0401	"unknown"	"Logitech Inc.|HP PageScan"
@@ -456,7 +458,7 @@
 0x04b9	0x1001	"unknown"	"Rainbow Technologies, Inc.|iKey 1200 Token"
 0x04b9	0x1200	"unknown"	"Rainbow Technologies, Inc.|iKey 2000 Token"
 0x04b9	0x1202	"unknown"	"Rainbow Technologies, Inc.|iKey 2032 Token"
-0x04b9	0x1300	"unknown"	"Rainbow Technologies, Inc.|iKey 3000 Token"
+0x04b9	0x1300	"smartcard:rnboifd"	"Rainbow Technologies, Inc.|iKey 3000 Token"
 0x04bb	0x0901	"kaweth"	"Rainbow Technologies, Inc.|"
 0x04bb	0x0904	"pegasus"	"I-O Data Device, Inc.|ET/TX Ethernet [pegasus]"
 0x04bb	0x0913	"pegasus"	""
@@ -955,8 +957,11 @@
 0x0763	0x1010	"unknown"	"Midiman|Midisport 1x1"
 0x0763	0x1020	"unknown"	"Midiman|Midisport 4x4"
 0x0763	0x1030	"unknown"	"Midiman|Midisport 8x8"
-0x076b	0x0596	"unknown"	"OmniKey Cardman 2020"
-0x076b	0x1784	"unknown"	"OmniKey Cardman 6020"
+0x076b	0x0596	"unknown"	"OmniKey|Cardman 2020"
+0x076b	0x1784	"unknown"	"OmniKey|Cardman 6020"
+0x076b	0x3021	"smartcard:cmok_ccid"	"OmniKey|Cardman CCID 3121"
+0x076b	0xa011	"smartcard:cmok_ccid"	"OmniKey|Cardman Smart@Link"
+0x076b	0xa021	"smartcard:cmok_ccid"	"OmniKey|Cardman Smart@Key"
 0x077c	0x0005	"unknown"	"Forward Electronics Co., Ltd.|NEC Keyboard"
 0x077d	0x0223	"unknown"	"Griffin Technology|IMic Audio In/Out"
 0x077d	0x0410	"powermate"	""
@@ -1163,6 +1168,8 @@
 0x0bdb	0x1002	"hci_usb"	""
 0x0bf6	0xa001	"usb-storage"	"ATI|USB Cable 205"
 0x0bf6	0xa002	"unknown"	"Addonics Technologies, Inc.|IDE Bridge"
+0x0bf8	0x1005	"smartcard:cmok_ccid"	"Fujitsu Siemens Computers|SmartCard Keyboard USB 2A"
+0x0bf8	0x1006	"smartcard:cmok_ccid"	"Fujitsu Siemens Computers|SmartCard Reader USB 2A"
 0x0c08	0x0378	"unknown"	"Agate|Q 16MB Storage Device"
 0x0c0b	0xa109	"unknown"	"Dura Micro, Inc. (Acomdata)|CF/SM Reader and Writer"
 0x0c0b	0xa10c	"unknown"	"Dura Micro, Inc. (Acomdata)|SD/MS Reader and Writer"
@@ -1203,6 +1210,7 @@
 0x1065	0x2136	"usb-storage"	"CCYU TECHNOLOGY|EasyDisk Portable Device"
 0x10b5	0x9060	"unknown"	"PLX|Test Board"
 0x10bd	0x1427	"kaweth"	"ASANTE|USB To Ethernet Adapter"
+0x10eb	0x0001	"usbnet"	""
 0x1110	0x900f	"adiusbadsl"	"Analog Devices Inc.|USB ADSL modem"
 0x1110	0x9010	"adiusbadsl"	"Analog Devices Inc.|USB ADSL modem"
 0x1110	0x9021	"adiusbadsl"	"Analog Devices Inc.|USB ADSL modem"