rh b7.3 merge, first step (33% done)

1 files changed, 66 insertions, 24 deletions

diff --git a/lst/pcitable b/lst/pcitable
index a8504a8f..2922c63f 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -16,6 +16,7 @@
 0x0675	0x1702	"ISDN:hisax,type=36"	"Dynalink|IS64PH ISDN Adapter"
 0x0871	0xffa1	"ISDN:hisax,type=35"	"German telekom|A1T"
 0x0871	0xffa2	"ISDN:hisax,type=35"	"German telekom|T-Concept"
+0x09c1	0x0704	"unknown"	"Arris|CM 200E Cable Modem"
 0x0e11	0x0001	"unknown"	"Compaq|PCI to EISA Bridge"
 0x0e11	0x0002	"unknown"	"Compaq|PCI to ISA Bridge"
 0x0e11	0x000f	"unknown"	"Compaq Computer Corp.|CPQB1A9 StorageWorks Library Adapter (HVD)"
@@ -91,7 +92,9 @@
 0x1000	0x000c	"sym53c8xx"	"Symbios|53c895"
 0x1000	0x000d	"sym53c8xx"	"Symbios|53c885"
 0x1000	0x000f	"sym53c8xx"	"Symbios|53c875"
-0x1000	0x0010	"cpqarray"	"Symbios|53c1510 Array Mode [Compaq Integrated Smart Array]"
+0x1000	0x0010	"sym53c8xx"	"Symbios|53c895"
+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	0x0012	"sym53c8xx"	"Symbios|53c895a"
 0x1000	0x0013	"sym53c8xx"	"Symbios|53c875a"
 0x1000	0x0020	"sym53c8xx"	"Symbios|53c1010-33 Ultra3 SCSI Adapter"
@@ -136,7 +139,7 @@
 0x1002	0x4747	"Card:ATI Mach64"	"ATI|3D Rage Pro"
 0x1002	0x4749	"Card:ATI Mach64"	"ATI|3D Rage Pro"
 0x1002	0x474c	"Card:ATI Mach64"	"ATI|Rage XC"
-0x1002	0x474d	"Card:ATI Mach64"	"ATI|Rage XL AGP"
+0x1002	0x474d	"Card:ATI Mach64"	"ATI|Rage XL AGP 2X"
 0x1002	0x474e	"Card:ATI Mach64"	"ATI|Rage XC AGP"
 0x1002	0x474f	"Card:ATI Mach64"	"ATI|Rage XL"
 0x1002	0x4750	"Card:ATI Mach64"	"ATI|3D Rage Pro 215GP"
@@ -164,6 +167,7 @@
 0x1002	0x4c53	"Card:ATI Rage Mobility"	"ATI|Rage Mobility L"
 0x1002	0x4c54	"Card:ATI Mach64"	"ATI|264LT [Mach64 LT]"
 0x1002	0x4c57	"Card:ATI Radeon"	"ATI|Radeon Mobility M6 LW"
+0x1002	0x4c58	"Card:ATI Radeon"	"ATI|Radeon Mobility M7 LW [FireGL]"
 0x1002	0x4c59	"Card:ATI Radeon"	"ATI|Radeon Mobility LY (AGP)"
 0x1002	0x4c5a	"Card:ATI Radeon"	"ATI|Radeon Mobility M6 LZ"
 0x1002	0x4d46	"Card:ATI Rage 128 Mobility"	"ATI|Rage Mobility M4 AGP"
@@ -196,7 +200,8 @@
 0x1002	0x5145	"Card:ATI Radeon"	"ATI|Radeon QE"
 0x1002	0x5146	"Card:ATI Radeon"	"ATI|Radeon QF"
 0x1002	0x5147	"Card:ATI Radeon"	"ATI|Radeon QG"
-0x1002	0x5148	"Card:ATI Radeon"	"ATI|Radeon R200 QH"
+0x1002	0x5148	0x1002	0x0152	"Card:ATI Radeon"	"ATI|Radeon R200 QH [FireGL 8800]"
+0x1002	0x5148	0x1002	0x0172	"Card:ATI Radeon"	"ATI|Radeon R200 QH [FireGL 8700]"
 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"
@@ -272,6 +277,12 @@
 0x100b	0x0020	"natsemi"	"National Semi|DP83810 10/100 Ethernet"
 0x100b	0x0021	"unknown"	"National Semiconductor|PC87200 PCI to ISA Bridge"
 0x100b	0x0022	"ns83820"	"National Semi|DP83820 10/100/1000 Ethernet"
+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"
+0x100b	0x0503	"Card:ATI Mach64"	"National Semiconductor|SCx200 Audio"
+0x100b	0x0504	"Card:ATI Mach64"	"National Semiconductor|SCx200 Video"
+0x100b	0x0505	"Card:ATI Mach64"	"National Semiconductor|SCx200 Bridge"
 0x100b	0xd001	"Card:ATI Mach64"	"National Semiconductor|87410"
 0x100c	0x3202	"Card:ET4000 W32i, W32p (generic)"	"Tseng Labs Inc|ET4000/W32p rev A"
 0x100c	0x3205	"Card:ET4000 W32i, W32p (generic)"	"Tseng Labs Inc|ET4000/W32p rev B"
@@ -279,9 +290,10 @@
 0x100c	0x3207	"Card:ET4000 W32i, W32p (generic)"	"Tseng Labs Inc|ET4000/W32p rev D"
 0x100c	0x3208	"Card:ET6000 (generic)"	"Tseng Labs Inc|ET6000"
 0x100c	0x4702	"Card:ET6000 (generic)"	"Tseng Labs Inc|ET6300"
-0x100e	0x9000	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9000"
-0x100e	0x9001	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9000"
-0x100e	0x9100	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9100"
+0x100e	0x9000	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9000 Viper"
+0x100e	0x9001	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9000 Viper"
+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	0x0004	"Card:Digital 8-plane TGA (UDB/Multia)"	"DEC|21030/TGA"
@@ -304,17 +316,17 @@
 0x1011	0x0026	"unknown"	"DEC|DECchip 21154"
 0x1011	0x0034	"unknown"	"Digital Equipment Corporation|Modem56 CardBus"
 0x1011	0x0045	"unknown"	"DEC|DECchip 21553"
-0x1011	0x0046	0x0e11	0x4050	"cpqarray"	"DEC|DECchip 21554"
-0x1011	0x0046	0x0e11	0x4051	"cpqarray"	"DEC|DECchip 21554"
-0x1011	0x0046	0x0e11	0x4058	"cpqarray"	"DEC|DECchip 21554"
+0x1011	0x0046	"cpqarray"	"DEC|DECchip 21554 [Compaq Smart Array Controller]"
+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	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	"cpqarray"	"DEC|DECchip 21554 [Compaq Smart Array Controller]"
+0x1011	0x1065	"DAC960"	"DEC|RAID Controller"
 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"
 0x1013	0x0038	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD 7548"
 0x1013	0x0040	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD7555 Flat Panel GUI Accelerator"
 0x1013	0x0045	"unknown"	"Cirrus Logic|A CL-MD5620DT-QC-B WINCOM V9.0 56K"
@@ -341,7 +353,7 @@
 0x1013	0x1202	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD 7543 [Viking]"
 0x1013	0x1204	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD 7541 [Nordic Light]"
 0x1013	0x4400	"unknown"	"Cirrus Logic|CD 4400"
-0x1013	0x6001	"cs46xx"	"Cirrus Logic|CS 4610/11 [CrystalClear SoundFusion Audio Accelerator]"
+0x1013	0x6001	0x1014	0x1010	"cs46xx"	"Cirrus Logic|CS 4610/11 [CrystalClear SoundFusion Audio Accelerator]"
 0x1013	0x6003	"snd-cs46xx"	"Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
 0x1013	0x6004	"cs46xx"	"Cirrus Logic|unknown (? CrystalClear SoundFusion Audio Accelerator?)"
 0x1013	0x6005	"cs4281"	"Cirrus Logic|Crystal CS4281 PCI Audio"
@@ -352,6 +364,7 @@
 0x1014	0x0017	"unknown"	"IBM|CPU to PCI Bridge"
 0x1014	0x0018	"lanstreamer"	"IBM|TR Auto LANstreamer"
 0x1014	0x001b	"unknown"	"IBM|GXT-150P"
+0x1014	0x001c	"unknown"	"IBM|Carrera"
 0x1014	0x001d	"unknown"	"IBM|82G2675"
 0x1014	0x0020	"unknown"	"IBM|MCA"
 0x1014	0x0022	"unknown"	"IBM|IBM27-82351"
@@ -424,11 +437,13 @@
 0x101e	0x9032	"unknown"	"American Megatrends Inc|EIDE & SCSI Controller"
 0x101e	0x9033	"unknown"	"American Megatrends Inc|SCSI Controller"
 0x101e	0x9040	"unknown"	"American Megatrends Inc|Multimedia card"
-0x101e	0x9060	"megaraid"	"AMI|MegaRAID"
+0x101e	0x9060	"megaraid"	"AMI|MegaRAID 434 Ultra GT RAID Controller"
+0x101e	0x9063	"megaraid"	"AMI|MegaRAC"
 0x1022	0x2000	"pcnet32"	"Advanced Micro Devices [AMD]|79c970 [PCnet LANCE]"
 0x1022	0x2001	"pcnet32"	"Advanced Micro Devices [AMD]|79c978 [HomePNA]"
 0x1022	0x2020	"tmscsim"	"Advanced Micro Devices [AMD]|53c974 [PCscsi]"
 0x1022	0x2040	"unknown"	"Advanced Micro Devices [AMD]|79c974"
+0x1022	0x3000	"unknown"	"Advanced Micro Devices|ELanSC520 Microcontroller"
 0x1022	0x7004	"unknown"	"Advanced Micro Devices|AMD-751 CPU to PCI Bridge"
 0x1022	0x7006	"agpgart"	"Advanced Micro Devices [AMD]|AMD-751 [Irongate] System Controller"
 0x1022	0x7007	"unknown"	"Advanced Micro Devices (AMD)|AMD-751 PCI to PCI bridge"
@@ -452,6 +467,7 @@
 0x1022	0x7440	"unknown"	"Advanced Micro Devices|AMD-768 PCI to ISA Bridge"
 0x1022	0x7441	"unknown"	"Advanced Micro Devices|AMD-768 EIDE Controller"
 0x1022	0x7443	"unknown"	"Advanced Micro Devices|AMD-768 ACPI Controller"
+0x1022	0x7445	"i810_audio"	"Advanced Micro Devices|AMD-768 Audio"
 0x1022	0x7448	"unknown"	"Advanced Micro Devices|AMD-768 PCI to PCI Bridge?"
 0x1022	0x7449	"unknown"	"Advanced Micro Devices|AMD-768 USB Controller"
 0x1022	0x7454	"unknown"	"Advanced Micro Devices|AMD-8151 System Controller"
@@ -532,6 +548,7 @@
 0x1025	0x1621	"unknown"	"Acer Incorporated [ALI]|M1621 Northbridge [Aladdin-Pro II]"
 0x1025	0x1631	"unknown"	"Acer Incorporated [ALI]|M1631 Northbridge+3D Graphics [Aladdin TNT2]"
 0x1025	0x1641	"unknown"	"Acer Incorporated [ALI]|M1641 Northbridge [Aladdin-Pro IV]"
+0x1025	0x1647	"unknown"	"Acer Incorporated [ALI]|M1647 [MaGiK1] PCI North Bridge"
 0x1025	0x3141	"unknown"	"Acer Incorporated [ALI]|M3141"
 0x1025	0x3143	"unknown"	"Acer Incorporated [ALI]|M3143"
 0x1025	0x3145	"unknown"	"Acer Incorporated [ALI]|M3145"
@@ -566,8 +583,11 @@
 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	"unknown"	"Dell Computer Corporation|Remote Assitant Card 3"
 0x1028	0x0008	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 3/Di"
 0x1028	0x000a	"aacraid"	"Dell Computer Corporation|PowerEdge Expandable RAID Controller 3/Si"
+0x1028	0x000c	"unknown"	"Dell Computer Corporation|Embedded Systems Management Device 4"
+0x1028	0x000e	"megaraid"	"Dell Computer Corporation|PowerEdge RAID Controller"
 0x102a	0x0000	"unknown"	"LSI Logic|HYDRA"
 0x102a	0x0010	"unknown"	"LSI Logic|ASPEN"
 0x102b	0x0010	"Card:Matrox Millennium"	"Matrox|MGA-I [Impression]"
@@ -580,6 +600,7 @@
 0x102b	0x051f	"Card:Matrox Millennium II"	"Matrox|MGA 2164W [Millennium II] AGP"
 0x102b	0x0520	"Card:Matrox Millennium G200"	"Matrox|MGA G200"
 0x102b	0x0521	"Card:Matrox Millennium G200"	"Matrox|MGA G200 AGP [Millennium] AGP"
+0x102b	0x0525	"Card:Matrox Millennium G400"	"Matrox|MGA G400 AGP"
 0x102b	0x0525	0x102b	0x0541	"Card:Matrox Millennium G450"	"Matrox|MGA G450 DualHead"
 0x102b	0x0525	0x102b	0x0542	"Card:Matrox Millennium G450"	"Matrox|MGA G450 DualHead LX"
 0x102b	0x0525	0x102b	0x0641	"Card:Matrox Millennium G450"	"Matrox|MGA G450 AGP"
@@ -597,7 +618,6 @@
 0x102b	0x0525	0x102b	0x0f82	"Card:Matrox Millennium G450"	"Matrox|MGA G450 Low Profile DVI"
 0x102b	0x0525	0x102b	0x0f83	"Card:Matrox Millennium G450"	"Matrox|MGA G450 Low Profile DVI"
 0x102b	0x0525	0x1705	0x0001	"Card:Matrox Millennium G450"	"Matrox|MGA G450 32S"
-0x102b	0x0525	"Card:Matrox Millennium G400"	"Matrox|MGA G400 AGP"
 0x102b	0x0d10	"Card:Matrox Mystique"	"Matrox|MGA Ultima/Impression"
 0x102b	0x1000	"Card:Matrox Productiva G100"	"Matrox|MGA G100 [Productiva]"
 0x102b	0x1001	"Card:Matrox Productiva G100"	"Matrox|MGA G100 [Productiva] AGP"
@@ -724,6 +744,7 @@
 0x103c	0x1008	"unknown"	"Hewlett-Packard Company|Donner GFX"
 0x103c	0x1028	"unknown"	"Hewlett-Packard Company|Tachyon TL Fibre Channel Adapter"
 0x103c	0x1029	"unknown"	"Hewlett-Packard Company|HPFC-5200B Tachyon XL2 Fibre Channel Adapter"
+0x103c	0x102a	"unknown"	"Hewlett-Packard Company|Tach TS Fibre Channel Host Adapter"
 0x103c	0x1030	"hp100"	"HP|J2585A"
 0x103c	0x1031	"hp100"	"HP|J2585B"
 0x103c	0x1040	"unknown"	"HP|J2973A DeskDirect 10BaseT NIC"
@@ -815,10 +836,13 @@
 0x104c	0x8011	"unknown"	"Texas Instruments|PCI4450 OHCI-Lynx IEEE 1394 Controller"
 0x104c	0x8017	"unknown"	"Texas Instruments|PCI4410 OHCI-Lynx IEEE 1394 Controller"
 0x104c	0x8019	"ohci1394"	"Texas Instruments|TSB12LV23 OHCI Compliant IEEE-1394 Controller"
-0x104c	0x8020	0x14db	0xf000	"ohci1394"	"Texas Instruments|TSB12LV26 OHCI-Lynx PCI IEEE 1394 Host Controller"
 0x104c	0x8020	"unknown"	"Texas Instruments|TSB12LV26 OHCI-Lynx PCI IEEE 1394 Host Controller"
+0x104c	0x8020	0x14db	0xf000	"ohci1394"	"Texas Instruments|TSB12LV26 OHCI-Lynx PCI IEEE 1394 Host Controller"
 0x104c	0x8021	"unknown"	"Texas Instruments|TSB43AA22 Firewire (IEEE1394) Cntrlr (w/ PHY/Link)"
+0x104c	0x8022	"unknown"	"Texas Instruments|TSB43AB22 IEEE-1394 Controller (PHY/Link) 1394a-2000"
 0x104c	0x8023	"ohci1394"	"Texas Instruments|TSB43AB22 IEEE1394a-2000 OHCI PHY/Link-Layer Ctrlr"
+0x104c	0x8024	"unknown"	"Texas Instruments|TSB43AB23 IEEE-1394 Controller (PHY/Link) 1394a-2000"
+0x104c	0x8026	"unknown"	"Texas Instruments|TSB43AB21 IEEE-1394 Controller (PHY/Link) 1394a-2000"
 0x104c	0x8027	"unknown"	"Texas Instruments|PCI4451 OHCI-Lynx IEEE 1394 Controller"
 0x104c	0xa001	"unknown"	"Texas Instruments|TDC1570 64-bit PCI ATM sar"
 0x104c	0xa100	"unknown"	"Texas Instruments|TDC1561 32-bit PCI ATM sar"
@@ -900,6 +924,8 @@
 0x1057	0x4806	"unknown"	"Motorola|CPX8216"
 0x1057	0x4809	"unknown"	"Motorola|CPX8216T HotSwap Controller"
 0x1057	0x4d68	"unknown"	"Motorola|20268"
+0x1057	0x4d69	"unknown"	"Motorola|20269"
+0x1057	0x5275	"unknown"	"Motorola|20276"
 0x1057	0x5600	"unknown"	"Motorola|SM56 PCI Modem"
 0x105a	0x0d30	"unknown"	"Promise Technology, Inc.|20265"
 0x105a	0x0d38	"unknown"	"Promise Technology|PDC20263 FastTrak66 EIDE Controller"
@@ -975,9 +1001,14 @@
 0x106b	0x0022	"unknown"	"Apple Computer Inc.|Keylargo Mac I/O Controller"
 0x106b	0x0024	"gmac"	"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	0x0027	"unknown"	"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	"unknown"	"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"
 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"
@@ -1002,7 +1033,8 @@
 0x1077	0x1020	"qlogicisp"	"Q Logic|ISP1020"
 0x1077	0x1022	"qlogicisp"	"Q Logic|ISP1022"
 0x1077	0x1080	"qla1280"	"Q Logic|QLA1080"
-0x1077	0x1216	"qla1280"	"Q Logic|QLA12160"
+0x1077	0x1216	0x101e	0x8471	"qla1280"	"Q Logic|QLA12160 on AMI MegaRAID"
+0x1077	0x1216	0x101e	0x8493	"qla1280"	"Q Logic|QLA12160 on AMI MegaRAID"
 0x1077	0x1240	"qla1280"	"Q Logic|QLA1240"
 0x1077	0x1280	"qla1280"	"Q Logic|QLA1280"
 0x1077	0x2020	"qlogicisp"	"Q Logic|ISP2020A"
@@ -1155,10 +1187,11 @@
 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	"unknown"	"Brooktree Corporation|Bt880 Video Capture"
+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)"
@@ -1257,6 +1290,7 @@
 0x10b6	0x0009	"unknown"	"Madge Networks|Smart 100/16/4 PCI-HS Ringnode"
 0x10b6	0x000a	"unknown"	"Madge Networks|Smart 100/16/4 PCI Ringnode"
 0x10b6	0x000b	"unknown"	"Madge Networks|16/4 CardBus Adapter Mk2"
+0x10b6	0x000c	"unknown"	"Madge Networks|RapidFire 3140V2 16/4 TR Adapter"
 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"
@@ -1264,7 +1298,7 @@
 0x10b7	0x1000	"unknown"	"3Com Corporation|3C905CX-TXNM 3COM 3C905CX-TXNM with 40-0664-003 ASIC"
 0x10b7	0x1007	"unknown"	"3Com Corporation|3C556 V.90 Mini-PCI Modem"
 0x10b7	0x3390	"tmspci"	"3Com Corporation|Token Link Velocity"
-0x10b7	0x3590	"unknown"	"3Com Corporation|3c359 TokenLink Velocity XL"
+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"
@@ -1281,12 +1315,15 @@
 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	"unknown"	"3Com Corporation|FEM656 10/100 LAN+56K Modem CardBus PC Card"
+0x10b7	0x6561	"3c59x"	"3Com Corporation|FEM656 10/100 LAN+56K Modem CardBus PC Card"
 0x10b7	0x6562	"3c59x"	"3Com Corporation|3CCFEM656 Cyclone CardBus"
-0x10b7	0x6563	"unknown"	"3Com Corporation|FEM656B 10/100 LAN+56K Modem CardBus PC Card"
+0x10b7	0x6563	"3c59x"	"3Com Corporation|FEM656B 10/100 LAN+56K Modem CardBus PC Card"
 0x10b7	0x6564	"3c59x"	""
 0x10b7	0x6565	"unknown"	"3Com Corporation|3CCFEM656C Global 10/100 Fast Ethernet+56K Modem"
 0x10b7	0x7646	"3c59x"	"3Com Corporation|3cSOHO100-TX [Hurricane]"
+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]"
@@ -1295,9 +1332,9 @@
 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"
+0x10b7	0x9051	"3c59x"	"3Com Corporation|3c905 100BaseT4 [Boomerang]"
 0x10b7	0x9055	"3c59x"	"3Com Corporation|3c905B 100BaseTX [Cyclone]"
-0x10b7	0x9056	"unknown"	"3Com Corporation|3c905B-T4"
+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]"
@@ -1341,6 +1378,7 @@
 0x10b9	0x1651	"unknown"	"Acer Labs Inc.|M1651 CPU to PCI Bridge"
 0x10b9	0x1661	"unknown"	"Acer Labs Inc.|M1661 AGP System Controller"
 0x10b9	0x1667	"unknown"	"Acer Labs Inc.|M1667 AGP System Controller"
+0x10b9	0x1671	"unknown"	"Acer Labs Inc.|M1671 Northbridge [Aladdin-P4]"
 0x10b9	0x3141	"unknown"	"Acer Laboratories Inc. [ALi]|M3141"
 0x10b9	0x3143	"unknown"	"Acer Laboratories Inc. [ALi]|M3143"
 0x10b9	0x3145	"unknown"	"Acer Laboratories Inc. [ALi]|M3145"
@@ -1357,12 +1395,16 @@
 0x10b9	0x5229	"unknown"	"Acer Laboratories Inc. [ALi]|M5229 IDE"
 0x10b9	0x5235	"unknown"	"Acer Laboratories Inc. [ALi]|M5225"
 0x10b9	0x5237	"usb-ohci"	"Acer Laboratories Inc. [ALi]|M5237 (USB)"
+0x10b9	0x5239	"usb-ohci"	"Acer Laboratories Inc. [ALi]|USB 2.0 Controller"
 0x10b9	0x5240	"unknown"	"Acer Labs Incorporated (ALI)|EIDE Controller"
 0x10b9	0x5241	"unknown"	"Acer Labs Incorporated (ALI)|PCMCIA Bridge"
 0x10b9	0x5242	"unknown"	"Acer Labs Incorporated (ALI)|General Purpose Controller"
 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	0x5251	"unknown"	"Acer Laboratories Inc. [ALi]|M5251 P1394 OHCI 1.0 Controller"
+0x10b9	0x5253	"unknown"	"Acer Laboratories Inc. [ALi]|5253 P1394 OHCI 1.1 Controller"
+0x10b9	0x5261	"unknown"	"Acer Laboratories Inc. [ALi]|M5261 Ethernet Controller"
 0x10b9	0x5451	"trident"	"Acer Laboratories Inc. [ALi]|M5451 PCI South Bridge Audio"
 0x10b9	0x7101	"unknown"	"Acer Laboratories Inc. [ALi]|M7101 PMU"
 0x10ba	0x0301	"unknown"	"Mitsubishi Electric Corp.|AccelGraphics AccelECLIPSE"
@@ -1384,8 +1426,8 @@
 0x10c8	0x0016	"Card:NeoMagic MagicMedia (laptop/notebook)"	"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"	"Neomagic Corporation|MagicMedia 256AV Audio Device on Colorado Inspiron"
 0x10c8	0x8005	"nm256_audio"	"Neomagic Corporation|[MagicMedia 256AV]"
+0x10c8	0x8005	0x1028	0x008f	"ad1848"	"Neomagic Corporation|MagicMedia 256AV Audio Device on Colorado Inspiron"
 0x10c8	0x8006	"nm256_audio"	"Neomagic Corporation|[MagicMedia 256AV]"
 0x10c8	0x8016	"unknown"	"Neomagic Corporation|NM2380 MagicMedia 256XL+ Audio Device"
 0x10cc	0x0226	"unknown"	"Mentor Arc Inc|PCI/ISA Bridge"
@@ -3150,8 +3192,8 @@
 0x8086	0x24c4	"usb-uhci"	"Intel Corporation|82801DB USB Controller"
 0x8086	0x24c5	"i810_audio"	"Intel Corporation|ICH4 845G/GL Chipset AC'97 Audio Controller"
 0x8086	0x24c7	"usb-uhci"	"Intel Corporation|82801DB USB Controller"
-0x8086	0x24cd	"ehci-hcd"	"Intel Corporation|82801DB USB Enhanced Controller"
 0x8086	0x24cb	"unknown"	"Intel Corporation|82801DB 845G/GL Chipset IDE Controller"
+0x8086	0x24cd	"ehci-hcd"	"Intel Corporation|82801DB USB Enhanced Controller"
 0x8086	0x2500	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge (MCH)"
 0x8086	0x2501	"unknown"	"Intel Corporation|82820 820 (Camino) Chipset Host Bridge (MCH)"
 0x8086	0x2502	"unknown"	"Intel Corporation|82820"