From: Karsten Hopp <karsten@redhat.com>
Date: Wed, 23 Jul 2008 10:18:02 +0000 (+0200)
Subject: - update usb.ids  pci.ids oui.txt
X-Git-Tag: hwdata-0.223-1~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=953378d28dca1ba873898749aaa76999d15bc668;p=oweals%2Fhwdata.git

- update usb.ids  pci.ids oui.txt
---

diff --git a/oui.txt b/oui.txt
index 389681c..ba373a4 100644
--- a/oui.txt
+++ b/oui.txt
@@ -3052,11 +3052,10 @@ company_id			Organization
 				Taejeon Republic of Korea 305
 				KOREA, REPUBLIC OF
 
-00-01-D6   (hex)		MAN Roland Druckmaschinen AG
-0001D6     (base 16)		MAN Roland Druckmaschinen AG
-				Stadtbachstr. 1
-				86135 Augsburg
-				GERMANY
+00-01-D6   (hex)		manroland AG
+0001D6     (base 16)		manroland AG
+				Stadtbachstrasse 1
+				86219 Augsburg
 				GERMANY
 
 00-01-D7   (hex)		F5 Networks, Inc.
@@ -6070,10 +6069,11 @@ company_id			Organization
 				20692
 				ISRAEL
 
-00-03-A4   (hex)		Data Storage and Information Management
-0003A4     (base 16)		Data Storage and Information Management
-				Discovery 2A30
-				Oakdale MN 55128
+00-03-A4   (hex)		Imation Corp.
+0003A4     (base 16)		Imation Corp.
+				1 Imation Place
+				Discovery 2B-50
+				Oakdale MN 55128-3414
 				UNITED STATES
 
 00-03-A5   (hex)		Medea Corporation
@@ -6508,10 +6508,10 @@ company_id			Organization
 				GERMANY
 				GERMANY
 
-00-03-E6   (hex)		Entone Technologies, Inc.
-0003E6     (base 16)		Entone Technologies, Inc.
-				1840 Gateway Drive Suite 200
-				San Mateo CA  94404
+00-03-E6   (hex)		Entone, Inc.
+0003E6     (base 16)		Entone, Inc.
+				2755 Campus Dr Ste 235
+				San Mateo CA  94403
 				UNITED STATES
 
 00-03-E7   (hex)		Logostek Co. Ltd.
@@ -14927,10 +14927,10 @@ company_id			Organization
 				Taipei  244
 				TAIWAN, REPUBLIC OF CHINA
 
-00-09-2D   (hex)		High Tech Computer, Corp.
-00092D     (base 16)		High Tech Computer, Corp.
-				23, Hsin Hua Rd.,
-				Taoyuan,
+00-09-2D   (hex)		HTC Corporation
+00092D     (base 16)		HTC Corporation
+				No 23, Hsin Hua Rd.
+				Taoyuan City,
 				330
 				TAIWAN, REPUBLIC OF CHINA
 
@@ -15611,8 +15611,8 @@ company_id			Organization
 
 00-09-99   (hex)		CP GEORGES RENAULT
 000999     (base 16)		CP GEORGES RENAULT
-				199 ROUTE DE CLISSON
-				ST SEBASTIEN SUR LOIRE  44230
+				38 Rue Bobby Sands
+				44800 Saint Herblain 
 				FRANCE
 
 00-09-9A   (hex)		ELMO COMPANY, LIMITED
@@ -18040,10 +18040,11 @@ company_id			Organization
 				Mountain View CA 94043
 				UNITED STATES
 
-00-0B-1A   (hex)		Teltone Corporation
-000B1A     (base 16)		Teltone Corporation
-				22116 23rd Drive SE
-				Bothell WA 98021
+00-0B-1A   (hex)		Industrial Defender, Inc.
+000B1A     (base 16)		Industrial Defender, Inc.
+				16 Chestnut Street
+				Suite 300
+				Foxborough MA 02035
 				UNITED STATES
 
 00-0B-1B   (hex)		Systronix, Inc.
@@ -23225,10 +23226,10 @@ company_id			Organization
 				MEYLAN  38410
 				FRANCE
 
-00-0E-56   (hex)		4G Systems GmbH
-000E56     (base 16)		4G Systems GmbH
-				Am Sandtorkai 71
-				Hamburg  20457
+00-0E-56   (hex)		4G Systems GmbH & Co. KG
+000E56     (base 16)		4G Systems GmbH & Co. KG
+				Jarrestrasse 2-6
+				22303 Hamburg 
 				GERMANY
 
 00-0E-57   (hex)		Iworld Networking, Inc.
@@ -34857,9 +34858,8 @@ company_id			Organization
 
 00-15-85   (hex)		Aonvision Technolopy Corp.
 001585     (base 16)		Aonvision Technolopy Corp.
-				RM 413, Bldg. 52, No 195, Sec. 4,
-				Chung Hsing Rd.,
-				Chutung, Hsinchu 310
+				2F, No. 58, Park 2nd Ave. Science-Based Industrial Park,
+				Hsinchu 300
 				TAIWAN, REPUBLIC OF CHINA
 
 00-15-86   (hex)		Xiamen Overseas Chinese Electronic Co., Ltd.
@@ -37831,8 +37831,8 @@ company_id			Organization
 				Incheon In-Cheon 405-865
 				KOREA, REPUBLIC OF
 
-00-17-5E   (hex)		Anta Systems, Inc.
-00175E     (base 16)		Anta Systems, Inc.
+00-17-5E   (hex)		Zed-3
+00175E     (base 16)		Zed-3
 				501 Valley Way
 				Milpitas CA 95035
 				UNITED STATES
@@ -46958,9 +46958,12 @@ company_id			Organization
 				San Jose CA 95134
 				UNITED STATES
 
-00-1C-FA   (hex)		PRIVATE
-001CFA     (base 16)		 
-				 
+00-1C-FA   (hex)		Alarm.com
+001CFA     (base 16)		Alarm.com
+				1861 International Drive
+				McLean VA 22102
+				UNITED STATES
+
 00-1C-FB   (hex)		Motorola CHS
 001CFB     (base 16)		Motorola CHS
 				6450 Sequence Drive
@@ -55507,11 +55510,11 @@ company_id			Organization
 				Taipei  231
 				TAIWAN, REPUBLIC OF CHINA
 
-00-22-44   (hex)		AzureWave Technologies, Inc.
-002244     (base 16)		AzureWave Technologies, Inc.
-				8F., No. 94, Baozhong Rd., Xindian
-				Taipei  231
-				TAIWAN, REPUBLIC OF CHINA
+00-22-44   (hex)		Chengdu Linkon Communications Device Co., Ltd
+002244     (base 16)		Chengdu Linkon Communications Device Co., Ltd
+				5f-02, Juntong Building, No. 53,Shuangfeng Road, Wuhou District,
+				Chengdu Sichuan 610041
+				CHINA
 
 00-22-45   (hex)		Leine & Linde AB
 002245     (base 16)		Leine & Linde AB
@@ -55557,6 +55560,1054 @@ company_id			Organization
 				Taipei  221
 				TAIWAN, REPUBLIC OF CHINA
 
+00-22-4C   (hex)		Nintendo Co., Ltd.
+00224C     (base 16)		Nintendo Co., Ltd.
+				11-1 HOKOTATE-CHO
+				KAMITOBA, MINAMI-KU
+				KYOTO  601-8501
+				JAPAN
+
+00-22-4D   (hex)		MITAC INTERNATIONAL CORP.
+00224D     (base 16)		MITAC INTERNATIONAL CORP.
+				6TH FL., NO187, TIDING BLVD., SEC. 2
+				Taipei  114
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-4E   (hex)		SEEnergy Corp.
+00224E     (base 16)		SEEnergy Corp.
+				4F, No.61, Dongsing RD.
+				Taipei  110
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-4F   (hex)		Byzoro Networks Ltd.
+00224F     (base 16)		Byzoro Networks Ltd.
+				Room 5A1,Block A, Keshi Plaza,No. 28A Info. Road,
+				HaiDian District,
+				Beijing 100085
+				CHINA
+
+00-22-50   (hex)		Point Six Wireless, LLC
+002250     (base 16)		Point Six Wireless, LLC
+				2333 Alumni Park Plaza
+				Suite 305
+				Lexington KY 40517
+				UNITED STATES
+
+00-22-51   (hex)		Lumasense Technologies
+002251     (base 16)		Lumasense Technologies
+				3033 Scott Blvd.
+				Santa Clara CA 95054
+				UNITED STATES
+
+00-22-52   (hex)		ZOLL Lifecor Corporation
+002252     (base 16)		ZOLL Lifecor Corporation
+				121 Freeport Road
+				Pittsburgh PA 15238
+				UNITED STATES
+
+00-22-53   (hex)		Entorian Technologies
+002253     (base 16)		Entorian Technologies
+				8900 Shoal Creek Blvd
+				Austin TX 78757
+				UNITED STATES
+
+00-22-54   (hex)		Bigelow Aerospace
+002254     (base 16)		Bigelow Aerospace
+				1899 W. Brooks Ave
+				North Las Vegas NV 89032
+				UNITED STATES
+
+00-22-55   (hex)		Cisco Systems
+002255     (base 16)		Cisco Systems
+				80 West Tasman Dr.
+				SJC-M/1
+				San Jose CA 95134
+				UNITED STATES
+
+00-22-56   (hex)		Cisco Systems
+002256     (base 16)		Cisco Systems
+				80 West Tasman Dr.
+				SJC-M/1
+				San Jose CA 95134
+				UNITED STATES
+
+00-22-57   (hex)		3Com Europe Ltd
+002257     (base 16)		3Com Europe Ltd
+				Peoplebuilding 2
+				Maylands Avenue
+				Hemel Hempstead Herts. HP2 4NW
+				UNITED KINGDOM
+
+00-22-58   (hex)		Taiyo Yuden Co., Ltd.
+002258     (base 16)		Taiyo Yuden Co., Ltd.
+				8-1, Sakae-cho
+				Takasaki-shi Gunma-ken 370-8522
+				JAPAN
+
+00-22-59   (hex)		Guangzhou New Postcom Equipment Co.,Ltd.
+002259     (base 16)		Guangzhou New Postcom Equipment Co.,Ltd.
+				No.3¡¡Guangpuxi Road,Guangzhou Science City,
+				Guangzhou Guangdong 510663
+				CHINA
+
+00-22-5A   (hex)		Garde Security AB
+00225A     (base 16)		Garde Security AB
+				Box 78
+				Soderhamn  S-826 22
+				SWEDEN
+
+00-22-5B   (hex)		Teradici Corporation
+00225B     (base 16)		Teradici Corporation
+				#500 - 4400 Dominion St.
+				Burnaby BC V5G $G3
+				CANADA
+
+00-22-5C   (hex)		Multimedia & Communication Technology
+00225C     (base 16)		Multimedia & Communication Technology
+				Digital Empire D-801 #980-3
+				YeongTong-Dong
+				Suwon-City KyeongGi-Do 443-813
+				KOREA, REPUBLIC OF
+
+00-22-5D   (hex)		Digicable Network India Pvt. Ltd.
+00225D     (base 16)		Digicable Network India Pvt. Ltd.
+				7B, Shah Industrial Estate
+				Off. Veera Desai Road,
+				Andheri - West, Mumbai. Maharashtra 400 053
+				INDIA
+
+00-22-5E   (hex)		Uwin Technologies Co.,LTD
+00225E     (base 16)		Uwin Technologies Co.,LTD
+				2F,No.22.R&D RD II,SBIP
+				Hsinchu  300
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-5F   (hex)		Liteon Technology Corporation
+00225F     (base 16)		Liteon Technology Corporation
+				4F,90,Chien 1 Road,ChungHo,
+				Taipei Hsien, 23585
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-60   (hex)		AFREEY Inc.
+002260     (base 16)		AFREEY Inc.
+				6F, No.249, Chien I Road
+				Chung Ho City Taipei County 235
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-61   (hex)		Frontier Silicon Ltd
+002261     (base 16)		Frontier Silicon Ltd
+				Gleneagles, The Belfry
+				Colonial Way
+				Watford Hertfordshire WD24 4WH
+				UNITED KINGDOM
+
+00-22-62   (hex)		BEP Marine
+002262     (base 16)		BEP Marine
+				13 Tarndale Grove Albany
+				North Shore
+				Auckland  0632
+				NEW ZEALAND
+
+00-22-63   (hex)		Koos Technical Services, Inc.
+002263     (base 16)		Koos Technical Services, Inc.
+				1025 Greenwood Blvd.
+				Suite 391
+				Lake Mary FL 32746
+				UNITED STATES
+
+00-22-64   (hex)		Hewlett Packard
+002264     (base 16)		Hewlett Packard
+				20555 State Highway 249
+				MS040802
+				Houston TX 77070
+				UNITED STATES
+
+00-22-65   (hex)		Nokia Danmark A/S
+002265     (base 16)		Nokia Danmark A/S
+				Frederikskaj
+				Copenhagen V  DK-1790
+				DENMARK
+
+00-22-66   (hex)		Nokia Danmark A/S
+002266     (base 16)		Nokia Danmark A/S
+				Frederikskaj
+				Copenhagen V  DK-1790
+				DENMARK
+
+00-22-67   (hex)		Nortel Networks
+002267     (base 16)		Nortel Networks
+				2221 Lakeside Blvd
+				Richardson Texas 75082-4399
+				UNITED STATES
+
+00-22-68   (hex)		Hon Hai Precision Ind. Co., Ltd.
+002268     (base 16)		Hon Hai Precision Ind. Co., Ltd.
+				66, Chung Shan Rd.Tu-Cheng
+				Taipei Hsien  236
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-69   (hex)		Hon Hai Precision Ind. Co., Ltd.
+002269     (base 16)		Hon Hai Precision Ind. Co., Ltd.
+				66, Chung Shan Rd.Tu-Cheng
+				Taipei Hsien  236
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-6A   (hex)		Honeywell
+00226A     (base 16)		Honeywell
+				8840 Evergreen Blvd.
+				Minneapolis MN 55433-6040
+				UNITED STATES
+
+00-22-6B   (hex)		Cisco-Linksys, LLC
+00226B     (base 16)		Cisco-Linksys, LLC
+				121 Theory Drive
+				Irvine California 92612
+				UNITED STATES
+
+00-22-6C   (hex)		LinkSprite Technologies, Inc.
+00226C     (base 16)		LinkSprite Technologies, Inc.
+				1410 Cannon Mountain Dr
+				Longmont CO 80503
+				UNITED STATES
+
+00-22-6D   (hex)		Shenzhen GIEC Electronics Co., Ltd.
+00226D     (base 16)		Shenzhen GIEC Electronics Co., Ltd.
+				24/F, XiNian Center, ShenNan Road 6021#, Futian District
+				Shenzhen Guangdong Province 518040
+				CHINA
+
+00-22-6E   (hex)		Gowell Electronic Limited
+00226E     (base 16)		Gowell Electronic Limited
+				Room 3601 ,36 Floor,Golden Central Tower,Jintian Road,Futian Central District,
+				Shenzhen GuangDong 518048
+				CHINA
+
+00-22-6F   (hex)		3onedata Technology Co. Ltd.
+00226F     (base 16)		3onedata Technology Co. Ltd.
+				3/F, B/2, Jiuxiangling Industrial District, Xili Town, Nanshan District,
+				Shenzhen Guangdong 518055
+				CHINA
+
+00-22-71   (hex)		Jäger Computergesteuerte Messtechnik GmbH
+002271     (base 16)		Jäger Computergesteuerte Messtechnik GmbH
+				Rheinstraße 2-4
+				Lorsch Hessen 64653
+				GERMANY
+
+00-22-72   (hex)		American Micro-Fuel Device Corp.
+002272     (base 16)		American Micro-Fuel Device Corp.
+				2181 Buchanan Loop
+				Ferndale WA 98248
+				UNITED STATES
+
+00-22-73   (hex)		Techway
+002273     (base 16)		Techway
+				Rm 1002, Daehyun Techno World Bd,
+				174, Ojun-Dong,
+				Uiwang-Si, Kyungki-Do 437-820
+				KOREA, REPUBLIC OF
+
+00-22-74   (hex)		FamilyPhone AB
+002274     (base 16)		FamilyPhone AB
+				Anckargripsgatan 3
+				Malmö  21119
+				SWEDEN
+
+00-22-75   (hex)		Belkin International, Inc.
+002275     (base 16)		Belkin International, Inc.
+				501 W. Walnut St.
+				Compton CA. 90220
+				UNITED STATES
+
+00-22-76   (hex)		Triple EYE B.V.
+002276     (base 16)		Triple EYE B.V.
+				Vaassenseweg 71
+				Emst  8166 AT
+				NETHERLANDS
+
+00-22-77   (hex)		NEC Australia Pty Ltd
+002277     (base 16)		NEC Australia Pty Ltd
+				649-655 Springvale Rd
+				Mulgrave Victoria 3170
+				AUSTRALIA
+
+00-22-78   (hex)		Shenzhen  Tongfang Multimedia  Technology Co.,Ltd.
+002278     (base 16)		Shenzhen  Tongfang Multimedia  Technology Co.,Ltd.
+				9th Floor,Building #D,Tongfang Information Harbour,High-tech Industrial Park,Langshan RD, NanShan District,
+				Shenzheng GuangDong 518058
+				CHINA
+
+00-22-79   (hex)		Nippon Conlux Co., Ltd.
+002279     (base 16)		Nippon Conlux Co., Ltd.
+				5-3-8, Chiyoda
+				Sakado-shi Saitama 350-0214
+				JAPAN
+
+00-22-7A   (hex)		Telecom Design
+00227A     (base 16)		Telecom Design
+				Za Remora
+				Voie Romaine
+				33170 Gradignan 
+				FRANCE
+
+00-22-7B   (hex)		Apogee Labs, Inc.
+00227B     (base 16)		Apogee Labs, Inc.
+				210 S. 3rd St.
+				North Wales PA 19454
+				UNITED STATES
+
+00-22-7C   (hex)		Woori SMT Co.,ltd
+00227C     (base 16)		Woori SMT Co.,ltd
+				649-2,Suwolam-ri,Seotan-Myun
+				Pyongtaek Kyonggi-Do 451-852
+				KOREA, REPUBLIC OF
+
+00-22-7D   (hex)		YE DATA INC.
+00227D     (base 16)		YE DATA INC.
+				182 Shinko
+				Iruma Saitama 358-0055
+				JAPAN
+
+00-22-7E   (hex)		Chengdu 30Kaitian Communication Industry Co.Ltd
+00227E     (base 16)		Chengdu 30Kaitian Communication Industry Co.Ltd
+				No.6 Chuangye Road
+				Chengdu Sichuan 610041
+				CHINA
+
+00-22-7F   (hex)		Ruckus Wireless
+00227F     (base 16)		Ruckus Wireless
+				880 West Maude Ave.
+				Suite 101
+				Sunnyvale CA 94085
+				UNITED STATES
+
+00-22-80   (hex)		A2B Electronics AB
+002280     (base 16)		A2B Electronics AB
+				Box 14
+				Motala  S-591 21
+				SWEDEN
+
+00-22-81   (hex)		Daintree Networks Inc
+002281     (base 16)		Daintree Networks Inc
+				3340 Walnut Ave
+				Suite 275
+				Fremont CA 94538
+				UNITED STATES
+
+00-22-82   (hex)		8086 Limited
+002282     (base 16)		8086 Limited
+				17 Lowfield Lane
+				Balderton
+				Newark Notts NG24 3HJ
+				UNITED KINGDOM
+
+00-22-83   (hex)		Juniper Networks
+002283     (base 16)		Juniper Networks
+				1194 N Mathilda Avenue
+				Sunnyvale CA 94089
+				UNITED STATES
+
+00-22-84   (hex)		DESAY A&V SCIENCE AND TECHNOLOGY CO.,LTD
+002284     (base 16)		DESAY A&V SCIENCE AND TECHNOLOGY CO.,LTD
+				DESAY 3rd Zone,Chenjiang,
+				Huizhou Guangdong 516229
+				CHINA
+
+00-22-85   (hex)		NOMUS COMM SYSTEMS
+002285     (base 16)		NOMUS COMM SYSTEMS
+				601, Gunjan Tower,
+				Off. Alembic Gorwa Road
+				Baroda Gujarat 390023
+				INDIA
+
+00-22-86   (hex)		ASTRON
+002286     (base 16)		ASTRON
+				Oudehoogeveensedijk 4
+				Dwingeloo Drenthe 7991PD
+				NETHERLANDS
+
+00-22-87   (hex)		Titan Wireless LLC
+002287     (base 16)		Titan Wireless LLC
+				1700 Bryant Dr
+				Suite 204
+				Round Rock Texas 78664
+				UNITED STATES
+
+00-22-88   (hex)		Sagrad, Inc.
+002288     (base 16)		Sagrad, Inc.
+				4325 Woodland Park Drive
+				Suite 101
+				W. Melbourne FL 32904
+				UNITED STATES
+
+00-22-89   (hex)		Optosecurity Inc.
+002289     (base 16)		Optosecurity Inc.
+				505, Boul. du Parc Technologique
+				Quebec  G1P 4S9
+				CANADA
+
+00-22-8A   (hex)		Teratronik elektronische systeme gmbh
+00228A     (base 16)		Teratronik elektronische systeme gmbh
+				Karl-Ulrich-Strasse 1
+				Gross-Umstadt  D-64823
+				GERMANY
+
+00-22-8B   (hex)		Kensington Computer Products Group
+00228B     (base 16)		Kensington Computer Products Group
+				333 Twin Dolphin Dr.
+				Sixth Floor
+				Redwood Shores CA 94065
+				UNITED STATES
+
+00-22-8C   (hex)		Solar Verlag GmbH
+00228C     (base 16)		Solar Verlag GmbH
+				Jülicher Straße 376
+				Aachen Nordrhein-Westfalen 52070
+				GERMANY
+
+00-22-8D   (hex)		GBS Laboratories LLC
+00228D     (base 16)		GBS Laboratories LLC
+				2325 Dulles Corner Blvd
+				Herndon VA 20171
+				UNITED STATES
+
+00-22-8E   (hex)		TV-NUMERIC
+00228E     (base 16)		TV-NUMERIC
+				24-26 rue Louis Armand
+				Paris  75015
+				FRANCE
+
+00-22-8F   (hex)		CNRS
+00228F     (base 16)		CNRS
+				MRCT
+				1 place Aristide Briand
+				Meudon Ile de France 92195
+				FRANCE
+
+00-22-90   (hex)		Cisco Systems
+002290     (base 16)		Cisco Systems
+				80 West Tasman Dr.
+				SJC-M/1
+				San Jose CA 95134
+				UNITED STATES
+
+00-22-91   (hex)		Cisco Systems
+002291     (base 16)		Cisco Systems
+				80 West Tasman Dr.
+				SJC-M/1
+				San Jose CA 95134
+				UNITED STATES
+
+00-22-92   (hex)		Cinetal
+002292     (base 16)		Cinetal
+				8651 Castle Park
+				Indianapolis IN 46256
+				UNITED STATES
+
+00-22-93   (hex)		ZTE Corporation
+002293     (base 16)		ZTE Corporation
+				12/F zte plaza,keji Road South,Hi-Tech Industrial Park,Nanshan District
+				Shenzhen Guangdong 518057
+				CHINA
+
+00-22-94   (hex)		Kyocera Corporation
+002294     (base 16)		Kyocera Corporation
+				2-1-1,Kagahara
+				Tsuzuki-ku
+				Yokohama-shi Kanagawa 224-8502
+				JAPAN
+
+00-22-95   (hex)		SGM Technology for lighting spa
+002295     (base 16)		SGM Technology for lighting spa
+				Via Pio La Torre 1
+				Tavullia PU 61010
+				ITALY
+
+00-22-96   (hex)		LinoWave Corporation
+002296     (base 16)		LinoWave Corporation
+				1001-101 Champlain Avenue
+				Burlington Onatario L7L 5Z4
+				CANADA
+
+00-22-97   (hex)		XMOS Semiconductor
+002297     (base 16)		XMOS Semiconductor
+				Venturers House
+				King Street
+				Bristol  BS1 4PB
+				UNITED KINGDOM
+
+00-22-98   (hex)		Sony Ericsson Mobile Communications
+002298     (base 16)		Sony Ericsson Mobile Communications
+				Nya Vattentornet
+				Lund Skåne 22188
+				SWEDEN
+
+00-22-99   (hex)		SeaMicro Inc.
+002299     (base 16)		SeaMicro Inc.
+				4677 Old Ironsides Dr.,
+				Suite 310
+				Santa Clara CA 95054
+				UNITED STATES
+
+00-22-9A   (hex)		Lastar, Inc.
+00229A     (base 16)		Lastar, Inc.
+				3555 Kettering BLVD.
+				Moraine Ohio 45439
+				UNITED STATES
+
+00-22-9B   (hex)		AverLogic Technologies, Inc.
+00229B     (base 16)		AverLogic Technologies, Inc.
+				7F-2, No.2, Lane 258, Rui Guang Rd., Nei-Hu Dist.,
+				Taipei Taiwan 114
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-9C   (hex)		Verismo Networks Inc
+00229C     (base 16)		Verismo Networks Inc
+				295 Bernando Avenue
+				Ste # 300
+				Mountain View CA 94043
+				UNITED STATES
+
+00-22-9D   (hex)		PYUNG-HWA IND.CO.,LTD
+00229D     (base 16)		PYUNG-HWA IND.CO.,LTD
+				230-1
+				Duckwoo-RI, Paltan-MYUN
+				HWASUNG-SI KYUNGGI-DO 445-912
+				KOREA, REPUBLIC OF
+
+00-22-9E   (hex)		Social Aid Research Co., Ltd.
+00229E     (base 16)		Social Aid Research Co., Ltd.
+				South 3, West 10, Chuo-ku
+				7F, Fukuyama-Minami-3jyou Build.
+				Sapporo Hokkaido 060-0063
+				JAPAN
+
+00-22-9F   (hex)		Sensys Traffic AB
+00229F     (base 16)		Sensys Traffic AB
+				Slottsgatan 14
+				Box 2174
+				Jonkoping Smaland 55322
+				SWEDEN
+
+00-22-A0   (hex)		Delphi Corporation
+0022A0     (base 16)		Delphi Corporation
+				M/C-480-405-255
+				5820 Delphi Drive
+				Troy MI 48446
+				UNITED STATES
+
+00-22-A1   (hex)		Huawei Symantec Technologies Co.,Ltd.
+0022A1     (base 16)		Huawei Symantec Technologies Co.,Ltd.
+				Building 1,The West Zone Science Park of UESTC,No.88,Tianchen Road
+				Chengdu Sichuan 611731
+				CHINA
+
+00-22-A2   (hex)		Xtramus Technologies
+0022A2     (base 16)		Xtramus Technologies
+				5th Fl., No. 102, Lide St.,
+				Zhonghe City Taipei County 235
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-A3   (hex)		California Eastern Laboratories
+0022A3     (base 16)		California Eastern Laboratories
+				4590 Patrick Henry Dr.
+				Santa Clara CA 95054
+				UNITED STATES
+
+00-22-A4   (hex)		2Wire
+0022A4     (base 16)		2Wire
+				1764 Automation Parkway
+				San Jose CA 95131
+				UNITED STATES
+
+00-22-A5   (hex)		Texas Instruments
+0022A5     (base 16)		Texas Instruments
+				12500 TI Boulevard, MS 8723
+				Dallas TX 75243
+				UNITED STATES
+
+00-22-A6   (hex)		Sony Computer Entertainment America
+0022A6     (base 16)		Sony Computer Entertainment America
+				919 East Hillsdale Blvd
+				Foster City California 94404-2175
+				UNITED STATES
+
+00-22-A7   (hex)		Tyco Electronics AMP GmbH
+0022A7     (base 16)		Tyco Electronics AMP GmbH
+				Amperestr. 12-14
+				Bensheim Hessen 64625
+				GERMANY
+
+00-22-A8   (hex)		Ouman Finland Oy
+0022A8     (base 16)		Ouman Finland Oy
+				Voimatie 6
+				Kempele  FIN-90440
+				FINLAND
+
+00-22-A9   (hex)		LG Electronics Inc
+0022A9     (base 16)		LG Electronics Inc
+				60-39,Gasan-dong
+				Gumchon-gu
+				Seoul  153-023
+				KOREA, REPUBLIC OF
+
+00-22-AA   (hex)		Nintendo Co., Ltd.
+0022AA     (base 16)		Nintendo Co., Ltd.
+				11-1 HOKOTATE-CHO
+				KAMITOBA, MINAMI-KU
+				KYOTO  601-8501
+				JAPAN
+
+00-22-AB   (hex)		Shenzhen Turbosight Technology Ltd
+0022AB     (base 16)		Shenzhen Turbosight Technology Ltd
+				Unit C-8A,Shennan Garden Bldg,Hightech Park,Nanshan District
+				Shenzhen Guangdong 518057
+				CHINA
+
+00-22-AC   (hex)		Hangzhou Siyuan Tech. Co., Ltd
+0022AC     (base 16)		Hangzhou Siyuan Tech. Co., Ltd
+				5 F, Tower B, No. 37, Xiang Yuan Road
+				Hangzhou Zhejiang 310012
+				CHINA
+
+00-22-AD   (hex)		TELESIS TECHNOLOGIES, INC.
+0022AD     (base 16)		TELESIS TECHNOLOGIES, INC.
+				28181 River Drive
+				Circleville Ohio 43113
+				UNITED STATES
+
+00-22-AE   (hex)		Mattel Inc.
+0022AE     (base 16)		Mattel Inc.
+				333 Continental Blvd.
+				El Segundo CA 90245
+				UNITED STATES
+
+00-22-AF   (hex)		Safety Vision
+0022AF     (base 16)		Safety Vision
+				6100 W. Sam Houston Pkwy. North
+				Houston Texas 77041
+				UNITED STATES
+
+00-22-B0   (hex)		D-Link Corporation
+0022B0     (base 16)		D-Link Corporation
+				No.289, Sinhu 3rd RD., Neihu District,
+				Taipei  114
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-B1   (hex)		Elbit Systems
+0022B1     (base 16)		Elbit Systems
+				POB 539
+				Haifa  31053
+				ISRAEL
+
+00-22-B2   (hex)		4RF Communications Ltd
+0022B2     (base 16)		4RF Communications Ltd
+				26 Glover Street
+				Ngauranga Wellington 6035
+				NEW ZEALAND
+
+00-22-B3   (hex)		Sei S.p.A.
+0022B3     (base 16)		Sei S.p.A.
+				Via Ruffilli, 1
+				Curno Bergamo 24035
+				ITALY
+
+00-22-B4   (hex)		Motorola Mobile Devices
+0022B4     (base 16)		Motorola Mobile Devices
+				600 N. U.S. Highway 45
+				Libertyville Illinois 60048
+				UNITED STATES
+
+00-22-B5   (hex)		NOVITA
+0022B5     (base 16)		NOVITA
+				3F301,Namsung B/D 340-30
+				Gasan-Dong
+				Geumcheon-Gu Seoul 153-782
+				KOREA, REPUBLIC OF
+
+00-22-B6   (hex)		Superflow Technologies Group
+0022B6     (base 16)		Superflow Technologies Group
+				4060 Dixon Street
+				Des Moines IA 50266
+				UNITED STATES
+
+00-22-B7   (hex)		GSS Grundig SAT-Systems GmbH
+0022B7     (base 16)		GSS Grundig SAT-Systems GmbH
+				Beutherner Strasse 43
+				Nuernberg Bayern 90471
+				GERMANY
+
+00-22-B8   (hex)		Norcott
+0022B8     (base 16)		Norcott
+				Brookfield House
+				Grimsditch Lane off Tarporley Road
+				Norcott Brook Cheshire WA4 4EA
+				UNITED KINGDOM
+
+00-22-B9   (hex)		Analogix Seminconductor, Inc
+0022B9     (base 16)		Analogix Seminconductor, Inc
+				3211 Scott Blvd., Suite 100
+				Santa Clara CA 95054
+				UNITED STATES
+
+00-22-BA   (hex)		HUTH Elektronik Systeme GmbH
+0022BA     (base 16)		HUTH Elektronik Systeme GmbH
+				Echternacher Str. 10
+				Troisdorf-Spich NRW 53842
+				GERMANY
+
+00-22-BB   (hex)		beyerdynamic GmbH & Co. KG
+0022BB     (base 16)		beyerdynamic GmbH & Co. KG
+				Theresienstr. 8
+				Heilbronn  74072
+				GERMANY
+
+00-22-BC   (hex)		JDSU France SAS
+0022BC     (base 16)		JDSU France SAS
+				34 rue Necker
+				SAINT ETIENNE LOIRE 42000
+				FRANCE
+
+00-22-BD   (hex)		Cisco Systems
+0022BD     (base 16)		Cisco Systems
+				80 West Tasman Dr.
+				SJC-M/1
+				San Jose CA 95134
+				UNITED STATES
+
+00-22-BE   (hex)		Cisco Systems
+0022BE     (base 16)		Cisco Systems
+				80 West Tasman Dr.
+				SJC-M/1
+				San Jose CA 95134
+				UNITED STATES
+
+00-22-BF   (hex)		SieAmp Group of Companies
+0022BF     (base 16)		SieAmp Group of Companies
+				2 Ang Mo Kio Street 64
+				Ang Mo Kio Industrial Park 3, Unit 02-01D Econ Building
+				Singapore  569084
+				SINGAPORE
+
+00-22-C0   (hex)		Shenzhen Forcelink Electronic Co, Ltd
+0022C0     (base 16)		Shenzhen Forcelink Electronic Co, Ltd
+				2nd and 3rd floor, Hasse manufacture building, Hasee industrial park
+				Banxuegang industrial area, Longgang district
+				Shenzhen Guangdong 518112
+				CHINA
+
+00-22-C1   (hex)		Active Storage Inc.
+0022C1     (base 16)		Active Storage Inc.
+				2295 Jefferson Street
+				Torrance CA 90501
+				UNITED STATES
+
+00-22-C2   (hex)		Proview Eletronica do Brasil LTDA
+0022C2     (base 16)		Proview Eletronica do Brasil LTDA
+				R. Acará, 203 - Distrito Industrial
+				Manaus Amazonas 69075-030
+				BRAZIL
+
+00-22-C3   (hex)		Zeeport Technology Inc.
+0022C3     (base 16)		Zeeport Technology Inc.
+				1F,No231,Xianzheng 2nd Rd.
+				HsinChu Taiwan 300
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-C4   (hex)		epro GmbH
+0022C4     (base 16)		epro GmbH
+				Joebkesweg 3
+				Gronau NRW 48599
+				GERMANY
+
+00-22-C5   (hex)		INFORSON Co,Ltd.
+0022C5     (base 16)		INFORSON Co,Ltd.
+				Room 704,Tower B1, ChangYuanTianDi Plaza
+				SuZhou Street, HaiDian District
+				BeiJing City  100080
+				CHINA
+
+00-22-C6   (hex)		Sutus Inc
+0022C6     (base 16)		Sutus Inc
+				301-3999 Henning Drive
+				Burnaby British Columbia V5C 6P9
+				CANADA
+
+00-22-C7   (hex)		SEGGER Microcontroller GmbH & Co. KG
+0022C7     (base 16)		SEGGER Microcontroller GmbH & Co. KG
+				In den Weiden 11
+				Hilden NRW 40721
+				GERMANY
+
+00-22-C8   (hex)		Applied Instruments
+0022C8     (base 16)		Applied Instruments
+				Edisonweg 39d
+				Vlissingen Zeeland NL-4382NV
+				NETHERLANDS
+
+00-22-C9   (hex)		Lenord, Bauer & Co GmbH
+0022C9     (base 16)		Lenord, Bauer & Co GmbH
+				Dohlenstr 32
+				Oberhausen NRW 46145
+				GERMANY
+
+00-22-CA   (hex)		Anviz Biometric Tech. Co., Ltd.
+0022CA     (base 16)		Anviz Biometric Tech. Co., Ltd.
+				5th Floor, 4299 Jindu Road,
+				Shanghai  201108
+				CHINA
+
+00-22-CB   (hex)		IONODES Inc.
+0022CB     (base 16)		IONODES Inc.
+				1555 Avenir
+				Suite 103
+				Laval Quebec H7S2N5
+				CANADA
+
+00-22-CC   (hex)		SciLog, Inc.
+0022CC     (base 16)		SciLog, Inc.
+				8845 South Greenview Drive
+				Suite 4
+				Middleton Wisconsin 53562
+				UNITED STATES
+
+00-22-CD   (hex)		Ared Technology Co., Ltd.
+0022CD     (base 16)		Ared Technology Co., Ltd.
+				6F-8 No.83 Sec.1, Nankan Rd. Luzhu Shiang
+				Taoyuan County Taiwan 33859
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-CE   (hex)		Scientific Atlanta, Cisco SPVTG
+0022CE     (base 16)		Scientific Atlanta, Cisco SPVTG
+				5030 Sugarloaf Parkway
+				Lawrenceville GA 30044
+				UNITED STATES
+
+00-22-CF   (hex)		PLANEX Communications INC
+0022CF     (base 16)		PLANEX Communications INC
+				2F FENISSAY Ebisu Bldg3-16-3
+				Shibuya-ku Tokyo 150-0011
+				JAPAN
+
+00-22-D0   (hex)		Polar Electro Oy
+0022D0     (base 16)		Polar Electro Oy
+				Professorintie 5
+				Kempele Oulu 90440
+				FINLAND
+
+00-22-D1   (hex)		Albrecht Jung GmbH & Co. KG
+0022D1     (base 16)		Albrecht Jung GmbH & Co. KG
+				Volmestraße 1
+				Schalksmühle NRW 58579
+				GERMANY
+
+00-22-D2   (hex)		All Earth Comércio de Eletrônicos LTDA.
+0022D2     (base 16)		All Earth Comércio de Eletrônicos LTDA.
+				Rua Bento de Arruda Camargo
+				270 - Jd. Santana
+				Campinas São Paulo 13088-650
+				BRAZIL
+
+00-22-D3   (hex)		Hub-Tech
+0022D3     (base 16)		Hub-Tech
+				77, Imae-dong
+				Bundang-gu
+				Seongnam-si Gyeonggi-do 463-829
+				KOREA, REPUBLIC OF
+
+00-22-D4   (hex)		ComWorth Co., Ltd.
+0022D4     (base 16)		ComWorth Co., Ltd.
+				2-35-7 Nishimagome
+				Ohta-ku Tokyo 143-0026
+				JAPAN
+
+00-22-D5   (hex)		Eaton Corp. Electrical Group Data Center Solutions - Pulizzi
+0022D5     (base 16)		Eaton Corp. Electrical Group Data Center Solutions - Pulizzi
+				3200 S. Susan St.
+				Santa Ana CA 92704
+				UNITED STATES
+
+00-22-D6   (hex)		Cypak AB
+0022D6     (base 16)		Cypak AB
+				P.O. BOX 2332
+				Funckens Gränd 1
+				Stockholm  103 18
+				SWEDEN
+
+00-22-D7   (hex)		Nintendo Co., Ltd.
+0022D7     (base 16)		Nintendo Co., Ltd.
+				11-1 HOKOTATE-CHO
+				KAMITOBA, MINAMI-KU
+				KYOTO  601-8501
+				JAPAN
+
+00-22-D8   (hex)		Shenzhen GST Security and Safety Technology Limited
+0022D8     (base 16)		Shenzhen GST Security and Safety Technology Limited
+				Room 502,Building 6 of Kupai Infomation Harbour,
+				No.2 Mengxi Road, HNTIA(North area),Nanshan District
+				Shenzhen Guangdong 518040
+				CHINA
+
+00-22-D9   (hex)		Fortex Industrial Ltd.
+0022D9     (base 16)		Fortex Industrial Ltd.
+				Flat 16, 12 /F.,Pacific Trade Centre
+				2 Kai Hing Road,Kowloon Bay,
+				Kowloon Hong Kong 852
+				CHINA
+
+00-22-DA   (hex)		ANATEK, LLC
+0022DA     (base 16)		ANATEK, LLC
+				3219 East Camelback Road
+				Suite 502
+				Phoenix AZ 85018
+				UNITED STATES
+
+00-22-DB   (hex)		Translogic Corporation
+0022DB     (base 16)		Translogic Corporation
+				10825 E. 47th Avenue
+				Denver Colorado 80239
+				UNITED STATES
+
+00-22-DC   (hex)		Vigil Health Solutions Inc.
+0022DC     (base 16)		Vigil Health Solutions Inc.
+				2102-4464 Markham St
+				Victoria BC V8Z 7X8
+				CANADA
+
+00-22-DD   (hex)		Protecta Electronics Ltd
+0022DD     (base 16)		Protecta Electronics Ltd
+				Kesmark str 7/A
+				Budapest Hungary 1158
+				HUNGARY
+
+00-22-DE   (hex)		OPPO Digital, Inc.
+0022DE     (base 16)		OPPO Digital, Inc.
+				2629B Terminal Blvd
+				Mountain View CA 94043
+				UNITED STATES
+
+00-22-DF   (hex)		TAMUZ Monitors
+0022DF     (base 16)		TAMUZ Monitors
+				Tiedenkamp 16
+				Henstedt-Ulzburg SH 24558
+				GERMANY
+
+00-22-E0   (hex)		Atlantic Software Technologies S.r.L.
+0022E0     (base 16)		Atlantic Software Technologies S.r.L.
+				Via Martino Bassi, 9
+				Milano  20148
+				ITALY
+
+00-22-E1   (hex)		ZORT Labs, LLC.
+0022E1     (base 16)		ZORT Labs, LLC.
+				44H Dover Point Road
+				Dover NH 03820
+				UNITED STATES
+
+00-22-E2   (hex)		WABTEC Transit Division
+0022E2     (base 16)		WABTEC Transit Division
+				130 Ridgeview Circle
+				Duncan SC 29334
+				UNITED STATES
+
+00-22-E3   (hex)		Amerigon
+0022E3     (base 16)		Amerigon
+				21680 Haggerty Road
+				Suite 101
+				Northville Michigan 48167
+				UNITED STATES
+
+00-22-E4   (hex)		APASS TECHNOLOGY CO., LTD.
+0022E4     (base 16)		APASS TECHNOLOGY CO., LTD.
+				2F, No. 267, Sec. 3, Chengde Rd.,
+				Datong District
+				TEIPEI  113
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-E5   (hex)		Fisher-Rosemount Systems Inc.
+0022E5     (base 16)		Fisher-Rosemount Systems Inc.
+				12301 Research Blvd
+				Building 3
+				Austin Texas 78759
+				UNITED STATES
+
+00-22-E6   (hex)		Intelligent Data
+0022E6     (base 16)		Intelligent Data
+				Edf. Inverinnova – Avda. Punto Mobi, 4. Parque Científico Tecnológico
+				TECNOALCALÁ. Crta. Nacional II Madrid-Barcelona Km. 31,600
+				Alcalá de Henares Madrid 28805
+				SPAIN
+
+00-22-E7   (hex)		WPS Parking Systems
+0022E7     (base 16)		WPS Parking Systems
+				Hoevenweg 11
+				Eindhoven Noord-Brabant 5652 AW
+				NETHERLANDS
+
+00-22-E8   (hex)		Applition Co., Ltd.
+0022E8     (base 16)		Applition Co., Ltd.
+				509-1, Bundang Techno Park D-dong,
+				151 Yatap-dong, Bundang-gu
+				SeongNam Kyunggi-do 463-760
+				KOREA, REPUBLIC OF
+
+00-22-E9   (hex)		ProVision Communications
+0022E9     (base 16)		ProVision Communications
+				1 Portland Square
+				Bristol  BS2 8RR
+				UNITED KINGDOM
+
+00-22-EA   (hex)		Rustelcom Inc.
+0022EA     (base 16)		Rustelcom Inc.
+				Garagniy proezd, 1
+				St.-Petersburg  192288
+				RUSSIAN FEDERATION
+
+00-22-EB   (hex)		Data Respons A/S
+0022EB     (base 16)		Data Respons A/S
+				Ellekær 6
+				Herlev  2730
+				DENMARK
+
+00-22-EC   (hex)		IDEALBT TECHNOLOGY CORPORATION
+0022EC     (base 16)		IDEALBT TECHNOLOGY CORPORATION
+				6F., NO.8, LANE 345, YANGGUANG ST., NEIHU DISTRICT
+				Taipei  114
+				TAIWAN, REPUBLIC OF CHINA
+
+00-22-ED   (hex)		TSI Power Corporation
+0022ED     (base 16)		TSI Power Corporation
+				1103 West Pierce Avenue
+				Antigo WI 54409
+				UNITED STATES
+
+00-22-EE   (hex)		Algo Communication Products Ltd
+0022EE     (base 16)		Algo Communication Products Ltd
+				4500 Beedie Street
+				Burnaby BC V5J 5L2
+				CANADA
+
+00-22-EF   (hex)		Ibis Tek, LLC
+0022EF     (base 16)		Ibis Tek, LLC
+				912 Pittsburgh Road
+				Butler PA 16002
+				UNITED STATES
+
+00-22-F0   (hex)		3 Greens Aviation Limited
+0022F0     (base 16)		3 Greens Aviation Limited
+				10 Hedingham Close
+				Macclesfield  SK10 3LZ
+				UNITED KINGDOM
+
+00-22-F1   (hex)		PRIVATE
+0022F1     (base 16)		 
+				 
+00-22-F2   (hex)		SunPower Corp
+0022F2     (base 16)		SunPower Corp
+				1414 Harbour Way South
+				Richmond CA 94804
+				UNITED STATES
+
 00-26-54   (hex)		3Com Corporation
 002654     (base 16)		3Com Corporation
 				5353 Betsy Ross Drive
diff --git a/pci.ids b/pci.ids
index b7c90be..2cc3507 100644
--- a/pci.ids
+++ b/pci.ids
@@ -11,7 +11,7 @@
 #	This file can be distributed under either the GNU General Public License
 #	(version 2 or higher) or the 3-clause BSD License.
 #
-#	Daily snapshot on Mon 2008-06-02 01:05:01
+#	Daily snapshot on Wed 2008-07-23 01:05:01
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -315,10 +315,10 @@
 		4c53 1310  P017 mezzanine (64-bit PMC)
 	0030  53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI
 		0e11 00da  ProLiant ML 350
-		1028 0123  PowerEdge 2600
-		1028 014a  PowerEdge 1750
+		1028 0123  LSI Logic 1020/1030
+		1028 014a  LSI Logic 1020/1030
 		1028 016c  PowerEdge 1850 MPT Fusion SCSI/RAID (Perc 4)
-		1028 0183  PowerEdge 1800
+		1028 0183  LSI Logic 1020/1030
 		1028 018a  PERC 4/IM
 		1028 1010  LSI U320 SCSI Controller
 		103c 12c5  Ultra320 SCSI [A7173A]
@@ -346,6 +346,7 @@
 		1033 8336  SAS1068
 	0056  SAS1064ET PCI-Express Fusion-MPT SAS
 	0057  M1064E MegaRAID SAS
+		8086 346c  Embedded Software RAID Technology II (ESTRII)
 	0058  SAS1068E PCI-Express Fusion-MPT SAS
 		1028 021d  SAS 6/iR Integrated Workstations RAID Controller
 		1028 1f0e  SAS 6/iR Adapter RAID Controller
@@ -371,7 +372,7 @@
 		1028 1f0a  PERC 6/E Adapter RAID Controller
 		1028 1f0b  PERC 6/i Adapter RAID Controller
 		1028 1f0c  PERC 6/i Integrated RAID Controller
-		1028 1f0d  CERC 6/i Adapter RAID Controller
+		1028 1f0d  PERC 6/i Integrated RAID Controller
 		1028 1f11  CERC 6/i Integrated RAID Controller
 		1033 835a  MegaRAID SAS PCI Express ROMB
 		1043 824d  MegaRAID SAS PCI Express ROMB
@@ -379,6 +380,8 @@
 		1170 0036  MegaRAID SAS PCI Express ROMB
 		15d9 c080  MegaRAID SAS PCI Express ROMB
 		17aa 6b7c  MegaRAID SAS PCI Express ROMB
+		18a1 0003  LSI MegaRAID SAS PCI Express ROMB
+		1fca 2163  LSI MegaRAID SAS PCI Express ROMB
 		8086 1006  RAID Controller SRCSAS28EP
 		8086 100a  RAID Controller SRCSAS28EV
 		8086 1010  RAID Controller SRCSATA28E
@@ -3512,7 +3515,7 @@
 	6312  SP202-based 2Gb Fibre Channel to PCI-X HBA
 	6322  SP212-based 2Gb Fibre Channel to PCI-X HBA
 	7220  IBA7220 InfiniBand HCA
-	8432  10GbE Converged Network Adapter (CNA)
+	8432  ISP2432M-based 10GbE Converged Network Adapter (CNA)
 1078  Cyrix Corporation
 	0000  5510 [Grappa]
 	0001  PCI Master
@@ -6478,6 +6481,46 @@
 	0003  IDT77222/77252 155Mbps ATM MICRO ABR SAR Controller
 	0004  IDT77V252 155Mbps ATM MICRO ABR SAR Controller
 	0005  IDT77V222 155Mbps ATM MICRO ABR SAR Controller
+	8018  PES12N3A PCI Express Switch
+	801c  PES24N3A PCI Express Switch
+	8028  PES4T4 PCI Express Switch
+	802b  PES8T5A PCI Express Switch
+	802c  PES16T4 PCI Express Switch
+	802d  PES16T7 PCI Express Switch
+	802e  PES24T6 PCI Express Switch
+	802f  PES32T8 PCI Express Switch
+	8032  PES48T12 PCI Express Switch
+	8034  PES16/22/34H16 PCI Express Switch
+	8035  PES32H8 PCI Express Switch
+	8036  PES48H12 PCI Express Switch
+	8037  PES64H16 PCI Express Switch
+	8039  PES3T3 PCI Express Switch
+	803a  PES4T4 PCI Express Switch
+	803c  PES5T5 PCI Express Switch
+	803d  PES6T5 PCI Express Switch
+	8048  PES8NT2 PCI Express Switch
+	8049  PES8NT2 PCI Express Switch
+	804a  PES8NT2 PCI Express Internal NTB
+	804b  PES8NT2 PCI Express External NTB
+	804c  PES16NT2 PCI Express Switch
+	804d  PES16NT2 PCI Express Switch
+	804e  PES16NT2 PCI Express Internal NTB
+	804f  PES16NT2 PCI Express External NTB
+	8058  PES12NT3 PCI Express Switch
+	8059  PES12NT3 PCI Express Switch
+	805a  PES12NT3 PCI Express Internal NTB
+	805b  PES12NT3 PCI Express External NTB
+	805c  PES24NT3 PCI Express Switch
+	805d  PES24NT3 PCI Express Switch
+	805e  PES24NT3 PCI Express Internal NTB
+	805f  PES24NT3 PCI Express External NTB
+	8060  PES16T4G2 PCI Express Gen2 Switch
+	8061  PES12T3G2 PCI Express Gen2 Switch
+	8068  PES6T6G2 PCI Express Gen2 Switch
+	806a  PES24T3G2 PCI Express Gen2 Switch
+	806c  PES16T4A/4T4G2 PCI Express Gen2 Switch
+	806e  PES24T6G2 PCI Express Gen2 Switch
+	806f  HIO524G2 PCI Express Gen2 Switch
 111e  Eldec
 111f  Precision Digital Images
 	4a47  Precision MX Video engine interface
@@ -9443,6 +9486,7 @@
 	000b  T210 Protocol Engine
 	000c  T204 Protocol Engine
 	0030  T310 10GbE Single Port Protocol Engine Ethernet Adapter
+		103c 705e  PCIe 10GBase-SR [AD386A]
 	0031  T320 10GbE Dual Port Protocol Engine Ethernet Adapter
 	0032  T302 1GbE Dual Port Protocol Engine Ethernet adapter
 	0033  T304 1GbE Quad Port Protocol Engine Ethernet adapter
@@ -9764,7 +9808,13 @@
 		107b 5048  E4500 Onboard
 	1601  NetXtreme BCM5752M Gigabit Ethernet PCI Express
 	1639  NetXtreme II BCM5709 Gigabit Ethernet
+		103c 7055  NC382i Integrated Quad Port PCI Express Gigabit Server Adapter
+		103c 7059  NC382T PCI Express Dual Port Multifunction Gigabit Server Adapter
 	163a  NetXtreme II BCM5709S Gigabit Ethernet
+# ice
+		103c 171d  NC382m Dual Port 1GbE Multifunction BL-c Adapter
+		103c 7056  NC382i Integrated Quad Port PCI Express Gigabit Server Adapter
+	163b  NetXtreme II BCM5716 Gigabit Ethernet
 	1644  NetXtreme BCM5700 Gigabit Ethernet
 		1014 0277  Broadcom Vigil B5700 1000Base-T
 		1028 00d1  Broadcom BCM5700
@@ -9808,6 +9858,7 @@
 		14e4 0006  BCM5701 1000Base-T
 		14e4 0007  BCM5701 1000Base-SX
 		14e4 0008  BCM5701 1000Base-T
+		14e4 1645  NetXtreme BCM5701 Gigabit Ethernet
 		14e4 8008  BCM5701 1000Base-T
 	1646  NetXtreme BCM5702 Gigabit Ethernet
 		0e11 00bb  NC7760 1000BaseTX
@@ -9826,6 +9877,7 @@
 		0e11 00cf  NC7772 Gigabit Server Adapter (PCI-X, 10,100,1000-T)
 		0e11 00d0  NC7782 Gigabit Server Adapter (PCI-X, 10,100,1000-T)
 		0e11 00d1  NC7783 Gigabit Server Adapter (PCI-X, 10,100,1000-T)
+		1028 014a  PowerEdge 1750
 		103c 310f  NC7782 Gigabit Server Adapter (PCI-X, 10,100,1000-T)
 		10a9 8013  Dual Port Gigabit Ethernet (PCI-X,Copper)
 		10a9 8018  Dual Port Gigabit Ethernet (A330)
@@ -9834,19 +9886,23 @@
 		10b7 2000  3C998-T Dual Port 10/100/1000 PCI-X
 		10b7 3000  3C999-T Quad Port 10/100/1000 PCI-X
 		1166 1648  NetXtreme CIOB-E 1000Base-T
-		1734 100b  Primergy RX300
+		1734 100b  PRIMERGY RX/TX series onboard LAN
 	1649  NetXtreme BCM5704S_2 Gigabit Ethernet
 	164a  NetXtreme II BCM5706 Gigabit Ethernet
 		103c 3070  NC380T PCI Express Dual Port Multifunction Gigabit Server Adapter
 		103c 3101  NC370T MultifuNCtion Gigabit Server Adapter
 	164c  NetXtreme II BCM5708 Gigabit Ethernet
+		1028 0205  Broadcom NetXtreme II BCM5708 1000Base-T (rev 12)
 		103c 7037  NC373T PCI Express Multifunction Gigabit Server Adapter
 		103c 7038  NC373i Integrated Multifunction Gigabit Server Adapter
 	164d  NetXtreme BCM5702FE Gigabit Ethernet
-# added marketing name - Everest
 	164e  NetXtreme II BCM57710 10Gigabit PCIe [Everest]
+		103c 171c  NC532m Dual Port 10GbE Multifunction BL-C Adapter
+		103c 7058  NC532i Dual Port 10GbE Multifunction BL-C Adapter
 	164f  NetXtreme II BCM57711 10Gigabit PCIe
-	1650  NetXtreme II BCM57712 10Gigabit PCIe
+	1650  NetXtreme II BCM57711E 10Gigabit PCIe
+		103c 171c  NC532m Dual Port 10GbE Multifunction BL-C Adapter
+		103c 7058  NC532i Dual Port 10GbE Multifunction BL-C Adapter
 	1653  NetXtreme BCM5705 Gigabit Ethernet
 		0e11 00e3  NC7761 Gigabit Server Adapter
 	1654  NetXtreme BCM5705_2 Gigabit Ethernet
@@ -9856,15 +9912,23 @@
 	1658  NetXtreme BCM5720 Gigabit Ethernet
 	1659  NetXtreme BCM5721 Gigabit Ethernet PCI Express
 		1014 02c6  eServer xSeries server mainboard
+		1028 01e6  PowerEdge 860
 		103c 7031  NC320T PCIe Gigabit Server Adapter
 		103c 7032  NC320i PCIe Gigabit Server Adapter
-		1734 1061  Primergy RX300 S2
+		1734 1061  PRIMERGY RX/TX S2 series onboard LAN
 	165a  NetXtreme BCM5722 Gigabit Ethernet PCI Express
+# Dual NIC server
+		1014 0378  IBM System x3350 (Machine type 4192)
+		1028 020f  PowerEdge R300
+		1028 0210  PowerEdge T300
+		1028 0225  PWA-Pandora Motherboard [PowerEdge T105]
 		103c 7051  NC105i PCIe Gigabit Server Adapter
 		103c 7052  NC105T PCIe Gigabit Server Adapter
 	165b  NetXtreme BCM5723 Gigabit Ethernet PCIe
+		103c 705d  NC107i Integrated PCI Express Gigabit Server Adapter
 	165d  NetXtreme BCM5705M Gigabit Ethernet
 		1028 865d  Latitude D400
+		14e4 165d  Dell Latitude D600
 	165e  NetXtreme BCM5705M_2 Gigabit Ethernet
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
@@ -9885,36 +9949,48 @@
 		1028 0179  Optiplex GX280
 		1028 0182  Latitude D610
 		1028 0187  Precision M70
-		1028 01ad  Optiplex GX620
+		1028 01ad  OptiPlex GX620
 		103c 3006  DC7100 SFF(DX878AV)
+		1462 028c  915P/G Neo2
 		1734 105d  Scenic W620
 		3007 103c  HP DC7100 USFF
 	1678  NetXtreme BCM5715 Gigabit Ethernet
+		103c 703e  NC326i PCIe Dual Port Gigabit Server Adapter
 	1679  NetXtreme BCM5715S Gigabit Ethernet
 		103c 1707  NC326m PCIe Dual Port Adapter
 		103c 170c  NC325m PCIe Quad Port Adapter
 		103c 703c  NC326i PCIe Dual Port Gigabit Server Adapter
 	167a  NetXtreme BCM5754 Gigabit Ethernet PCI Express
+		1028 01da  OptiPlex 745
+		1028 01de  Precision 390
+		1028 01df  PowerEdge SC440
 	167b  NetXtreme BCM5755 Gigabit Ethernet PCI Express
+		103c 280a  DC5750 Microtower
 	167c  NetXtreme BCM5750M Gigabit Ethernet
 	167d  NetXtreme BCM5751M Gigabit Ethernet PCI Express
+		1014 0577  ThinkPad Z60t
 		103c 0940  HP Compaq nw8240 Mobile Workstation
-		17aa 2081  Thinkpad R60e model 0657
+		17aa 2081  ThinkPad R60e
 	167e  NetXtreme BCM5751F Fast Ethernet PCI Express
 	167f  NetLink BCM5787F Fast Ethernet PCI Express
 	1680  NetXtreme BCM5761e Gigabit Ethernet PCIe
 	1681  NetXtreme BCM5761 Gigabit Ethernet PCIe
 	1684  NetXtreme BCM5764M Gigabit Ethernet PCIe
 	1693  NetLink BCM5787M Gigabit Ethernet PCI Express
+		1025 0121  Aspire 5920G
+		103c 30c0  6710b
 	1696  NetXtreme BCM5782 Gigabit Ethernet
 		103c 12bc  d530 CMT (DG746A)
 		14e4 000d  NetXtreme BCM5782 1000Base-T
 	1698  NetLink BCM5784M Gigabit Ethernet PCIe
+	1699  NetLink BCM5785 Gigabit Ethernet
 	169a  NetLink BCM5786 Gigabit Ethernet PCI Express
 	169b  NetLink BCM5787 Gigabit Ethernet PCI Express
 	169c  NetXtreme BCM5788 Gigabit Ethernet
 		103c 308b  MX6125
 		103c 30a1  NC2400
+		144d c018  X20
+		1462 590c  KT6 Delta-FIS2R (MS-6590)
 	169d  NetLink BCM5789 Gigabit Ethernet PCI Express
 	16a6  NetXtreme BCM5702X Gigabit Ethernet
 		0e11 00bb  NC7760 Gigabit Server Adapter (PCI-X, 10/100/1000-T)
@@ -9954,24 +10030,33 @@
 	16dd  NetLink BCM5781 Gigabit Ethernet PCI Express
 	16f7  NetXtreme BCM5753 Gigabit Ethernet PCI Express
 	16fd  NetXtreme BCM5753M Gigabit Ethernet PCI Express
+		103c 30a3  Compaq nw8440
 	16fe  NetXtreme BCM5753F Fast Ethernet PCI Express
 	170c  BCM4401-B0 100Base-TX
 		1028 0188  Inspiron 6000 laptop
 		1028 018d  Inspiron 700m/710m
 		1028 0196  Inspiron 5160
 		1028 01af  Inspiron 6400
+		1028 01cd  Inspiron 9400 Laptop
+		1028 01d7  XPS M1210
+		1028 01d8  Inspiron E1405
 		103c 099c  NX6110/NC6120
+		103c 30a2  NX7300 laptop
+		14e4 170c  HP Compaq 6720t Mobile Thin Client
 	170d  NetXtreme BCM5901 100Base-TX
-		1014 0545  ThinkPad R40e (2684-HVG) builtin ethernet controller
+		1014 0545  ThinkPad R40e
 	170e  NetXtreme BCM5901 100Base-TX
 	1712  NetLink BCM5906 Fast Ethernet PCI Express
 	1713  NetLink BCM5906M Fast Ethernet PCI Express
+		1028 01f3  Inspiron 1420
+		1028 0209  XPS M1330
 	3352  BCM3352
 	3360  BCM3360
 	4210  BCM4210 iLine10 HomePNA 2.0
 	4211  BCM4211 iLine10 HomePNA 2.0 + V.90 56k modem
 	4212  BCM4212 v.90 56k modem
 	4220  802-11b/g Wireless PCI controller, packaged as a Linksys WPC54G ver 1.2 PCMCIA card
+	4222  NetXtreme BCM5753M Gigabit Ethernet PCI Express
 	4301  BCM4303 802.11b Wireless LAN Controller
 		1028 0407  TrueMobile 1180 Onboard WLAN
 		1043 0120  WL-103b Wireless LAN PC Card
@@ -9979,13 +10064,47 @@
 	4306  BCM4307 Ethernet Controller
 	4307  BCM4307 802.11b Wireless LAN Controller
 	4310  BCM4310 Chipcommon I/OController
-	4311  BCM94311MCG wlan mini-PCI
+	4311  BCM4311 802.11b/g WLAN
+		1028 0007  Wireless 1390 WLAN Mini-Card
+		1028 0008  Wireless 1390 WLAN ExpressCard
+		103c 1363  BCM4311 802.11b/g Wireless LAN Controller
+		103c 1364  BCM4311 802.11b/g Wireless LAN Controller
+		103c 1365  BCM4311 802.11b/g Wireless LAN Controller
+		103c 1374  BCM4311 802.11b/g Wireless LAN Controller
+		103c 1375  BCM4311 802.11b/g Wireless LAN Controller
+		103c 1376  BCM4311 802.11b/g Wireless LAN Controller
+		103c 1377  BCM4311 802.11b/g Wireless LAN Controller
+		103c 137f  BCM4322 802.11a/b/g/n Wireless LAN Controller
+		103c 1380  BCM4322 802.11a/b/g/n Wireless LAN Controller
+		14e4 4311  BCM94311MCG
 	4312  BCM4312 802.11a/b/g
+		1028 0007  Wireless 1490 Dual Band WLAN Mini-Card
+		1028 0008  Wireless 1490 Dual Band WLAN ExpressCard
+		103c 135a  Broadcom 802.11a/b/g WLAN
+		103c 135f  Broadcom 802.11a/b/g WLAN
+		103c 1360  Broadcom 802.11a/b/g WLAN
+		103c 1361  Broadcom 802.11a/b/g WLAN
+		103c 1362  Broadcom 802.11a/b/g WLAN
+		103c 1370  Broadcom 802.11a/b/g WLAN
+		103c 1371  Broadcom 802.11a/b/g WLAN
+		103c 1372  Broadcom 802.11a/b/g WLAN
+		103c 1373  Broadcom 802.11a/b/g WLAN
+		103c 30b5  Presario V3242AU
+		1371 103c  Broadcom 802.11 Multiband-netwerkadapter(6715s)
 	4313  BCM4310 Ethernet Controller
-	4315  BCM4310 USB Controller
+	4315  BCM4312 802.11b/g
+		1028 000b  Wireless 1395 WLAN Mini-Card
+		1028 000c  Wireless 1397 WLAN Mini-Card
+		103c 137c  BCM4312 802.11b/g Wireless LAN Controller
+		103c 137d  BCM4312 802.11b/g Wireless LAN Controller
 	4318  BCM4318 [AirForce One 54g] 802.11g Wireless LAN Controller
-		103c 1356  MX6125
+		1028 0005  Wireless 1370 WLAN Mini-PCI Card
+		1028 0006  Wireless 1370 WLAN PC Card
+		103c 1355  Broadcom 802.11b/g WLAN
+		103c 1356  Broadcom 802.11b/g WLAN
+		103c 1357  Broadcom 802.11b/g WLAN
 		1043 120f  A6U notebook embedded card
+		1154 0355  Buffalo WLI2-PCI-G54S High Speed Mode Wireless Adapter
 		1468 0311  Aspire 3022WLMi, 5024WLMi, 5020
 		1468 0312  TravelMate 2410
 		14e4 0449  Gateway 7510GX
@@ -9994,11 +10113,20 @@
 		1737 0042  WMP54GS version 1.1 [Wireless-G PCI Adapter]  802.11g w/SpeedBooster
 		1737 0048  WPC54G-EU version 3 [Wireless-G Notebook Adapter]
 	4319  BCM4311 [AirForce 54g] 802.11a/b/g PCI Express Transceiver
+		1028 0005  Wireless 1470 Dual Band WLAN Mini-PCI Card
+		1028 0006  Wireless 1470 Dual Band WLAN PC Card
+		103c 1358  Broadcom 802.11a/b/g WLAN
+		103c 1359  Broadcom 802.11a/b/g WLAN
+		103c 135a  Broadcom 802.11a/b/g WLAN
 	4320  BCM4306 802.11b/g Wireless LAN Controller
 		1028 0001  TrueMobile 1300 WLAN Mini-PCI Card
+		1028 0002  TrueMobile 1300 WLAN PC Card
 		1028 0003  Wireless 1350 WLAN Mini-PCI Card
-		103c 12f4  NX9500 Built-in Wireless
-		103c 12fa  Presario R3000 802.11b/g
+		1028 0004  Wireless 1350 WLAN PC Card
+		103c 12f4  Broadcom 802.11b/g WLAN
+		103c 12f8  Broadcom 802.11b/g WLAN
+		103c 12fa  Broadcom 802.11b/g WLAN
+		103c 12fb  Broadcom 802.11b/g WLAN
 		1043 100f  WL-100G
 		1057 7025  WN825G
 		106b 004e  AirPort Extreme
@@ -10007,6 +10135,7 @@
 		144f 7051  Sonnet Aria Extreme PCI
 		14e4 4320  Linksys WMP54G PCI
 		1737 4320  WPC54G
+		1799 7000  F5D7000uk 54G Wireless Network Card
 		1799 7001  Belkin F5D7001 High-Speed Mode Wireless G Network Card
 		1799 7010  Belkin F5D7010 54g Wireless Network card
 		1799 7011  F5D7011 54g+ Wireless Network card
@@ -10015,18 +10144,30 @@
 	4322  BCM4306 UART
 	4324  BCM4309 802.11a/b/g
 		1028 0001  Truemobile 1400
+		1028 0002  TrueMobile 1400 Dual Band WLAN PC Card
 		1028 0003  Truemobile 1450 MiniPCI
+		1028 0004  Wireless 1450 Dual Band WLAN PC Card
+		103c 12f9  Broadcom 802.11a/b/g WLAN
+		103c 12fc  Broadcom 802.11a/b/g WLAN
 	4325  BCM43xG 802.11b/g
 		1414 0003  Wireless Notebook Adapter MN-720
 		1414 0004  Wireless PCI Adapter MN-730
 	4326  BCM4307 Chipcommon I/O Controller?
 # This should be the correct naming
 	4328  BCM4328 802.11a/b/g/n
+		1028 0009  Wireless 1500 Draft 802.11n WLAN Mini-Card
 		1028 000a  Wireless 1500 Draft 802.11n WLAN Mini-card
+		103c 1366  BCM4321 802.11a/b/g/n Wireless LAN Controller
+		103c 1367  BCM4321 802.11a/b/g/n Wireless LAN Controller
+		103c 1368  BCM4321 802.11a/b/g/n Wireless LAN Controller
+		103c 1369  BCM4321 802.11a/b/g/n Wireless LAN Controller
+		14e4 4328  BCM4328 802.11a/b/g/n
 	4329  BCM43XG
 	432b  BCM4322 802.11a/b/g/n Wireless LAN Controller
+		1028 000d  Wireless 1510 Wireless-N WLAN Mini-Card
 	4344  EDGE/GPRS data and 802.11b/g combo cardbus [GC89]
 	4401  BCM4401 100Base-T
+		1025 0035  TravelMate 660
 		103c 08b0  tc1100 tablet
 		1043 80a8  A7V8X motherboard
 	4402  BCM4402 Integrated 10/100BaseT
@@ -10803,6 +10944,7 @@
 	12d7  5LS172.61 B&R Dual CAN Interface Card
 	20ad  5ACPCI.MFIO-K01 Profibus DP / K-Feldbus / COM
 1678  NetEffect
+	0100  NE020 10Gb Accelerated Ethernet Adapter (iWARP RNIC)
 1679  Tokyo Electron Device Ltd.
 167b  ZyDAS Technology Corp.
 	2102  ZyDAS ZD1202
@@ -11996,6 +12138,7 @@
 		1458 e000  Intel Gigabit Ethernet (Kenai II)
 		8086 1019  ASUS PC-DL Deluxe mainboard (Socket 603)
 		8086 301f  D865PERL mainboard
+		8086 3025  D875PBZ motherboard
 		8086 302c  Intel 82865G Mainboard (D865GBF)
 		8086 3427  S875WP1-E mainboard
 	101a  82547EI Gigabit Ethernet Controller (Mobile)
@@ -12190,6 +12333,7 @@
 	1095  PRO/100 VE Network Connection
 	1096  80003ES2LAN Gigabit Ethernet Controller (Copper)
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	1097  631xESB/632xESB DPT LAN Controller (Fiber)
 	1098  80003ES2LAN Gigabit Ethernet Controller (Serdes)
 	1099  82546GB Gigabit Ethernet Controller (Copper)
@@ -12238,6 +12382,7 @@
 	10bd  82566DM-2 Gigabit Network Connection
 		1028 0211  OptiPlex 755
 		3039 17aa  Lenovo M57 USFF
+	10be  82567 Gigabit Network Connection
 	10bf  82567LF Gigabit Network Connection
 	10c0  82562V-2 10/100 Network Connection
 	10c2  82562G-2 10/100 Network Connection
@@ -12261,6 +12406,8 @@
 	10cc  82567LM-2 Gigabit Network Connection
 	10cd  82567LF-2 Gigabit Network Connection
 	10ce  82567V-2 Gigabit Network Connection
+	10d3  82574L Gigabit Network Connection
+		8086 a01f  Gigabit CT Desktop Adapter
 	10d5  82571PT Gigabit PT Quad Port Server ExpressModule
 	10d6  82575GB Gigabit Network Connection
 		8086 10d6  Gigabit VT Quad Port Server Adapter
@@ -12270,8 +12417,11 @@
 	10da  82571EB Quad Port Gigabit Mezzanine Adapter
 		103c 1717  NC364m Quad Port 1GbE BL-c Adapter
 	10dd  82598EB 10 Gigabit AT CX4 Network Connection
+	10de  82567LM-3 Gigabit Network Connection
+	10df  82567LF-3 Gigabit Network Connection
 	10e2  82575GB Gigabit Network Connection
 		8086 10e2  Gigabit VT Quad Port Server Adapter
+	10e5  82567LM-4 Gigabit Network Connection
 	10ec  10 Gigabit AT CX4 Network Connection
 		8086 a01f  10 Gigabit CX4 Dual Port Server Adapter
 		8086 a11f  10 Gigabit CX4 Dual Port Server Adapter
@@ -12422,6 +12572,7 @@
 		8086 1051  EtherExpress PRO/100 Server Adapter
 		8086 1052  EtherExpress PRO/100 Server Adapter
 		8086 10f0  EtherExpress PRO/100+ Dual Port Adapter
+		8086 1229  82557/8/9 [Ethernet Pro 100]
 		8086 2009  EtherExpress PRO/100 S Mobile Adapter
 		8086 200d  EtherExpress PRO/100 Cardbus
 		8086 200e  EtherExpress PRO/100 LAN+V90 Cardbus Modem
@@ -12530,6 +12681,7 @@
 	1a31  82845 845 [Brookdale] Chipset AGP Bridge
 	1a38  5000 Series Chipset DMA Engine
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	1a48  82597EX 10GbE Ethernet Controller
 		8086 a01f  PRO/10GbE SR Server Adapter
 		8086 a11f  PRO/10GbE SR Server Adapter
@@ -12613,6 +12765,7 @@
 # (rev d3) (prog-if (rev d3) (prog-if 01 [Subtractive decode])
 		103c 0934  HP Compaq nw8240 Mobile Workstation
 		103c 099c  NX6110/NC6120
+		103c 309f  HP Compaq nx9420
 		103c 30a3  Compaq nw8440
 		103c 30c1  Compaq 6910p
 		144d c00c  P30 notebook
@@ -12816,6 +12969,7 @@
 		103c 08b0  tc1100 tablet
 		1043 80b0  P4B533
 		1071 8160  MIM2000
+		1179 0201  Toshiba Tecra M1
 		144d c005  X10 Laptop
 		144d c00c  P30/P35 notebook
 		1458 a002  GA-8PE667 Ultra
@@ -13252,6 +13406,7 @@
 	25d4  5000V Chipset Memory Controller Hub
 		15d9 8680  X7DVL-E-O motherboard
 	25d8  5000P Chipset Memory Controller Hub
+		8086 3476  Intel S5000PSLSATA Server Board
 	25e2  5000 Series Chipset PCI Express x4 Port 2
 	25e3  5000 Series Chipset PCI Express x4 Port 3
 	25e4  5000 Series Chipset PCI Express x4 Port 4
@@ -13260,14 +13415,19 @@
 	25e7  5000 Series Chipset PCI Express x4 Port 7
 	25f0  5000 Series Chipset FSB Registers
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	25f1  5000 Series Chipset Reserved Registers
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	25f3  5000 Series Chipset Reserved Registers
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	25f5  5000 Series Chipset FBD Registers
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	25f6  5000 Series Chipset FBD Registers
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	25f7  5000 Series Chipset PCI Express x8 Port 2-3
 	25f8  5000 Series Chipset PCI Express x8 Port 4-5
 	25f9  5000 Series Chipset PCI Express x8 Port 6-7
@@ -13413,6 +13573,7 @@
 		1014 05b7  ThinkPad Z60t
 # based on the PTGD1-LA motherboard
 		103c 2a09  PufferM-UL8E
+		1043 1173  Asus A6VC
 		1043 814e  P5GD1-VW Mainboard
 		1462 7028  915P/G Neo2
 	266a  82801FB/FBM/FR/FW/FRW (ICH6 Family) SMBus Controller
@@ -13456,21 +13617,28 @@
 		e4bf 58b1  XB1
 	2670  631xESB/632xESB/3100 Chipset LPC Interface Controller
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	2680  631xESB/632xESB/3100 Chipset SATA IDE Controller
 	2681  631xESB/632xESB SATA AHCI Controller
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	2682  631xESB/632xESB SATA RAID Controller
 	2683  631xESB/632xESB SATA RAID Controller
 	2688  631xESB/632xESB/3100 Chipset UHCI USB Controller #1
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	2689  631xESB/632xESB/3100 Chipset UHCI USB Controller #2
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	268a  631xESB/632xESB/3100 Chipset UHCI USB Controller #3
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	268b  631xESB/632xESB/3100 Chipset UHCI USB Controller #4
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	268c  631xESB/632xESB/3100 Chipset EHCI USB2 Controller
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	2690  631xESB/632xESB/3100 Chipset PCI Express Root Port 1
 	2692  631xESB/632xESB/3100 Chipset PCI Express Root Port 2
 	2694  631xESB/632xESB/3100 Chipset PCI Express Root Port 3
@@ -13480,6 +13648,7 @@
 	269a  631xESB/632xESB High Definition Audio Controller
 	269b  631xESB/632xESB/3100 Chipset SMBus Controller
 		15d9 8680  X7DVL-E-O motherboard
+		8086 3476  Intel S5000PSLSATA Server Board
 	269e  631xESB/632xESB IDE Controller
 		15d9 8680  X7DVL-E-O motherboard
 	2770  82945G/GZ/P/PL Memory Controller Hub
@@ -13512,6 +13681,7 @@
 		e4bf 58b1  XB1
 	27a0  Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub
 		1025 006c  9814 WKMI
+		1028 01d7  XPS M1210
 		103c 30a1  NC2400
 		103c 30a3  Compaq nw8440
 		17aa 2015  ThinkPad T60
@@ -13534,6 +13704,8 @@
 		107b 5048  E4500
 		8086 544e  DeskTop Board D945GTP
 	27b9  82801GBM (ICH7-M) LPC Interface Bridge
+		1028 01d7  XPS M1210
+		103c 309f  HP Compaq nx9420
 		103c 30a1  NC2400
 		103c 30a3  Compaq nw8440
 		10f7 8338  Panasonic CF-Y5 laptop
@@ -13555,6 +13727,7 @@
 		8086 544e  DeskTop Board D945GTP
 	27c4  82801GBM/GHM (ICH7 Family) SATA IDE Controller
 		1025 006c  9814 WKMI
+		1028 01d7  XPS M1210
 		17aa 200e  Thinkpad T60 model 2007
 	27c5  82801GBM/GHM (ICH7 Family) SATA AHCI Controller
 		103c 30a3  Compaq nw8440
@@ -13563,6 +13736,7 @@
 	27c8  82801G (ICH7 Family) USB UHCI Controller #1
 		1025 006c  9814 WKMI
 		1028 01ad  OptiPlex GX620
+		1028 01d7  XPS M1210
 		1028 01df  PowerEdge SC440
 		1028 01e6  PowerEdge 860
 		103c 30a1  NC2400
@@ -13573,6 +13747,7 @@
 	27c9  82801G (ICH7 Family) USB UHCI Controller #2
 		1025 006c  9814 WKMI
 		1028 01ad  OptiPlex GX620
+		1028 01d7  XPS M1210
 		1028 01df  PowerEdge SC440
 		1028 01e6  PowerEdge 860
 		103c 30a1  NC2400
@@ -13583,6 +13758,7 @@
 	27ca  82801G (ICH7 Family) USB UHCI Controller #3
 		1025 006c  9814 WKMI
 		1028 01ad  OptiPlex GX620
+		1028 01d7  XPS M1210
 		1028 01df  PowerEdge SC440
 		1028 01e6  PowerEdge 860
 		103c 30a1  NC2400
@@ -13593,6 +13769,7 @@
 	27cb  82801G (ICH7 Family) USB UHCI Controller #4
 		1025 006c  9814 WKMI
 		1028 01ad  OptiPlex GX620
+		1028 01d7  XPS M1210
 		1028 01df  PowerEdge SC440
 		103c 30a1  NC2400
 		103c 30a3  Compaq nw8440
@@ -13602,6 +13779,7 @@
 	27cc  82801G (ICH7 Family) USB2 EHCI Controller
 		1025 006c  9814 WKMI
 		1028 01ad  OptiPlex GX620
+		1028 01d7  XPS M1210
 		1028 01df  PowerEdge SC440
 		1028 01e6  PowerEdge 860
 		103c 30a1  NC2400
@@ -13617,6 +13795,7 @@
 		103c 30a3  Compaq nw8440
 	27d8  82801G (ICH7 Family) High Definition Audio Controller
 		1025 006c  9814 WKMI
+		1028 01d7  XPS M1210
 		103c 30a1  NC2400
 		103c 30a3  Compaq nw8440
 		1043 13c4  Asus G2P
@@ -13629,11 +13808,12 @@
 		17aa 2010  ThinkPad T60/R60 series
 		17aa 3802  Lenovo 3000 C200 audio [Realtek ALC861VD]
 		8086 1112  DeskTop Board D945GTP
-		8086 27d8  Lenovo 3000 N100 Audio (Intel HDA)
+		8086 27d8  DeskTop Board D945GTP
 		a102 1458  DeskTop Board Gigabyte GA-8I945PG-RH
 	27da  82801G (ICH7 Family) SMBus Controller
 		1025 006c  9814 WKMI
 		1028 01ad  OptiPlex GX620
+		1028 01d7  XPS M1210
 		1028 01df  PowerEdge SC440
 		1028 01e6  PowerEdge 860
 		10f7 8338  Panasonic CF-Y5 laptop
@@ -13666,6 +13846,7 @@
 	2812  82801HH (ICH8DH) LPC Interface Controller
 	2814  82801HO (ICH8DO) LPC Interface Controller
 	2815  82801HEM (ICH8M) LPC Interface Controller
+		1025 0121  Aspire 5920G
 		1028 01f3  Inspiron 1420
 		103c 30c0  Compaq 6710b
 		103c 30d9  Presario C700
@@ -13684,6 +13865,7 @@
 		1028 01f3  Inspiron 1420
 		e4bf cc47  CCG-RUMBA
 	2829  82801HBM/HEM (ICH8M/ICH8M-E) SATA AHCI Controller
+		1025 0121  Aspire 5920G
 		103c 30c0  Compaq 6710b
 		103c 30c1  Compaq 6910p
 		103c 30d9  Presario C700
@@ -13691,6 +13873,7 @@
 		17aa 20a7  ThinkPad T61
 	282a  Mobile 82801 SATA RAID Controller
 	2830  82801H (ICH8 Family) USB UHCI Controller #1
+		1025 0121  Acer Aspire 5920G
 		1028 01da  OptiPlex 745
 		1028 01f3  Inspiron 1420
 		103c 30c0  Compaq 6710b
@@ -13702,6 +13885,7 @@
 		17aa 20aa  ThinkPad T61
 		e4bf cc47  CCG-RUMBA
 	2831  82801H (ICH8 Family) USB UHCI Controller #2
+		1025 0121  Aspire 5920G
 		1028 01da  OptiPlex 745
 		1028 01f3  Inspiron 1420
 		103c 30c0  Compaq 6710b
@@ -13714,6 +13898,7 @@
 		17aa 20aa  ThinkPad T61
 		e4bf cc47  CCG-RUMBA
 	2832  82801H (ICH8 Family) USB UHCI Controller #3
+		1025 0121  Aspire 5920G
 		1028 01da  OptiPlex 745
 		1028 01f3  Inspiron 1420
 		103c 30c0  Compaq 6710b
@@ -13724,6 +13909,7 @@
 		17aa 20aa  ThinkPad T61
 		e4bf cc47  CCG-RUMBA
 	2834  82801H (ICH8 Family) USB UHCI Controller #4
+		1025 0121  Aspire 5920G
 		1028 01da  OptiPlex 745
 		1028 01f3  Inspiron 1420
 		103c 30c0  Compaq 6710b
@@ -13734,6 +13920,7 @@
 		17aa 20aa  ThinkPad T61
 		e4bf cc47  CCG-RUMBA
 	2835  82801H (ICH8 Family) USB UHCI Controller #5
+		1025 0121  Acer Aspire 5920G
 		1028 01da  OptiPlex 745
 		1028 01f3  Inspiron 1420
 		103c 30c0  Compaq 6710b
@@ -13743,6 +13930,7 @@
 		17aa 20aa  ThinkPad T60
 		e4bf cc47  CCG-RUMBA
 	2836  82801H (ICH8 Family) USB2 EHCI Controller #1
+		1025 0121  Aspire 5920G
 		1028 01da  OptiPlex 745
 		1028 01f3  Inspiron 1420
 		103c 30c0  Compaq 6710b
@@ -13754,6 +13942,7 @@
 		17aa 20ab  ThinkPad T61
 		e4bf cc47  CCG-RUMBA
 	283a  82801H (ICH8 Family) USB2 EHCI Controller #2
+		1025 0121  Acer Aspire 5920G
 		1028 01da  OptiPlex 745
 		1028 01f3  Inspiron 1420
 		103c 30c0  Compaq 6710b
@@ -13763,6 +13952,7 @@
 		17aa 20ab  ThinkPad T61
 		e4bf cc47  CCG-RUMBA
 	283e  82801H (ICH8 Family) SMBus Controller
+		1025 0121  Aspire 5920G
 		1028 01da  OptiPlex 745
 		1028 01f3  Inspiron 1420
 		103c 30d9  Presario C700
@@ -13785,9 +13975,11 @@
 	284b  82801H (ICH8 Family) HD Audio Controller
 		0690 107b  Gateway P-6825
 		1025 011f  Realtek ALC268 audio codec
+		1025 0121  Aspire 5920G
 		1028 01da  OptiPlex 745
 		1028 01f3  Inspiron 1420
 		1028 01f9  Dell Latitude D630
+		1028 01ff  Dell Precision M4300
 		103c 2802  HP Compaq dc7700p
 		103c 30c0  Compaq 6710b
 		103c 30c1  Compaq 6910p
@@ -13798,6 +13990,7 @@
 		8384 7616  Dell Vostro 1400
 	284f  82801H (ICH8 Family) Thermal Reporting Device
 	2850  82801HBM/HEM (ICH8M/ICH8M-E) IDE Controller
+		1025 0121  Aspire 5920G
 		1028 01f3  Inspiron 1420
 		103c 30c0  Compaq 6710b
 		103c 30c1  Compaq 6910p
@@ -13850,6 +14043,7 @@
 		1028 0211  Optiplex 755
 		1028 2011  Optiplex 755
 		8086 2937  Optiplex 755
+		8086 2942  828011 (ICH9 Family ) USB UHCI Controller
 	2938  82801I (ICH9 Family) USB UHCI Controller #5
 		1028 0211  Optiplex 755
 		8086 2938  Optiplex 755
@@ -13956,6 +14150,7 @@
 	29f7  3200/3210 Chipset Serial KT Controller
 	29f9  3210 Chipset Host-Secondary PCI Express Bridge
 	2a00  Mobile PM965/GM965/GL960 Memory Controller Hub
+		1025 0121  Acer Aspire 5920G
 		1028 01f3  Inspiron 1420
 		103c 30c0  Compaq 6710b
 		103c 30c1  Compaq 6910p
@@ -14258,31 +14453,31 @@
 	3a05  ICH10 SATA RAID Controller
 	3a06  ICH10 2 port SATA IDE Controller
 	3a14  ICH10 LPC Interface Controller
-	3a16  ICH10 LPC Interface Controller
-	3a18  ICH10 LPC Interface Controller
+	3a16  82801JIR (ICH10R) LPC Interface Controller
+	3a18  82801JIB (ICH10) LPC Interface Controller
 	3a1a  ICH10 LPC Interface Controller
-	3a20  ICH10 4 port SATA IDE Controller
-	3a22  ICH10 6 port SATA AHCI Controller
-	3a25  ICH10 SATA RAID Controller
-	3a26  ICH10 2 port SATA IDE Controller
-	3a30  ICH10 SMBus Controller
-	3a32  ICH10 Thermal Subsystem
-	3a34  ICH10 USB UHCI Controller #1
-	3a35  ICH10 USB UHCI Controller #2
-	3a36  ICH10 USB UHCI Controller #3
-	3a37  ICH10 USB UHCI Controller #4
-	3a38  ICH10 USB UHCI Controller #5
-	3a39  ICH10 USB UHCI Controller #6
-	3a3a  ICH10 USB2 EHCI Controller #1
-	3a3c  ICH10 USB2 EHCI Controller #2
-	3a3e  ICH10 HD Audio Controller
-	3a40  ICH10 PCI Express Port 1
-	3a42  ICH10 PCI Express Port 2
-	3a44  ICH10 PCI Express Port 3
-	3a46  ICH10 PCI Express Port 4
-	3a48  ICH10 PCI Express Port 5
-	3a4a  ICH10 PCI Express Port 6
-	3a4c  ICH10 Gigabit Ethernet Controller
+	3a20  82801JI (ICH10 Family) 4 port SATA IDE Controller
+	3a22  82801JI (ICH10 Family) SATA AHCI Controller
+	3a25  82801JIR (ICH10R) SATA RAID Controller
+	3a26  82801JI (ICH10 Family) 2 port SATA IDE Controller
+	3a30  82801JI (ICH10 Family) SMBus Controller
+	3a32  82801JI (ICH10 Family) Thermal Subsystem
+	3a34  82801JI (ICH10 Family) USB UHCI Controller #1
+	3a35  82801JI (ICH10 Family) USB UHCI Controller #2
+	3a36  82801JI (ICH10 Family) USB UHCI Controller #3
+	3a37  82801JI (ICH10 Family) USB UHCI Controller #4
+	3a38  82801JI (ICH10 Family) USB UHCI Controller #5
+	3a39  82801JI (ICH10 Family) USB UHCI Controller #6
+	3a3a  82801JI (ICH10 Family) USB2 EHCI Controller #1
+	3a3c  82801JI (ICH10 Family) USB2 EHCI Controller #2
+	3a3e  82801JI (ICH10 Family) HD Audio Controller
+	3a40  82801JI (ICH10 Family) PCI Express Port 1
+	3a42  82801JI (ICH10 Family) PCI Express Port 2
+	3a44  82801JI (ICH10 Family) PCI Express Port 3
+	3a46  82801JI (ICH10 Family) PCI Express Port 4
+	3a48  82801JI (ICH10 Family) PCI Express Port 5
+	3a4a  82801JI (ICH10 Family) PCI Express Port 6
+	3a4c  82801JI (ICH10 Family) Gigabit Ethernet Controller
 	3a51  ICH10 VECI Controller
 	3a55  ICH10 Virtual SATA Controller
 	3a60  ICH10 SMBus Controller
@@ -14333,9 +14528,11 @@
 		103c 135c  Compaq 6710b
 		103c 30c0  Compaq 6710b
 		8086 1000  PRO/Wireless 3945ABG Network Connection
+		8086 1001  PRO/Wireless 3945ABG Network Connection
 		8086 1005  PRO/Wireless 3945BG Network Connection
 		8086 1034  PRO/Wireless 3945BG Network Connection
 		8086 1044  PRO/Wireless 3945BG Network Connection
+		8086 1c00  PRO/Wireless 3945ABG Network Connection
 	4223  PRO/Wireless 2915ABG Network Connection
 		1000 8086  mPCI 3B Americas/Europe ZZA
 		1001 8086  mPCI 3B Europe ZZE
@@ -14468,6 +14665,8 @@
 		1028 008e  PowerEdge 1300 mainboard
 	7192  440BX/ZX/DX - 82443BX/ZX/DX Host bridge (AGP disabled)
 		0e11 0460  Armada 1700 Laptop System Chipset
+# \\
+		1179 0001  Satellite 4010
 		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
 		8086 7190  Dell PowerEdge 350
 	7194  82440MX Host Bridge
@@ -14543,6 +14742,7 @@
 	96a1  Integrated RAID
 	a620  6400/6402 Advanced Memory Buffer (AMB)
 	b152  21152 PCI-to-PCI Bridge
+		8086 b152  21152 PCI-to-PCI Bridge
 # observed, and documented in Intel revision note; new mask of 1011:0026
 	b154  21154 PCI-to-PCI Bridge
 	b555  21555 Non transparent PCI-to-PCI Bridge
diff --git a/usb.ids b/usb.ids
index fa01e97..43b3025 100644
--- a/usb.ids
+++ b/usb.ids
@@ -7,7 +7,7 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# $Id: usb.ids,v 1.351 2008/05/28 10:04:53 gowdy Exp $
+# $Id: usb.ids,v 1.367 2008/07/22 20:22:31 dbrownell Exp $
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -48,6 +48,7 @@
 	2022  at90usbkey sample firmware (composite device)
 	2103  JTAG ICE mkII
 	2104  AVR ISP mkII
+	2106  STK600 development board
 	2107  AVR Dragon
 	2ffb  at90usb AVR DFU bootloader
 	2ffd  at89c5130/c5131 DFU bootloader
@@ -151,6 +152,7 @@
 	0a01  ScanJet 2400c
 	0a17  color LaserJet 3700
 	0b01  Scanjet 82x0C
+	0b0c  Wireless Keyboard and Optical Mouse
 	0b17  Laserjet 2300d
 	0c17  LaserJet 1010
 	0c24  Bluetooth Dongle
@@ -1021,6 +1023,7 @@
 	0024  5610 XpressMusic (Storage mode)
 	0025  5610 XpressMusic (PC-Suite mode)
 	0028  5610 XpressMusic (Imaging mode)
+	0042  E51 (PC-Suite mode)
 	0096  N810 Internet Tablet
 	0103  ADL Flashing Engine AVALON Parent
 	0104  ADL Re-Flashing Engine Parent
@@ -1332,7 +1335,7 @@
 	3004  Bluetooth Adapter
 	3005  Integrated Bluetooth Device
 	3006  Bluetooth Adapter
-	3007  GlidePoint PS/2 TouchPad
+	3007  Bluetooth Controller (ALPS/UGX)
 	300c  Bluetooth Controller (ALPS/UGPZ6)
 	300d  Bluetooth Controller (ALPS/UGPZ6)
 	ffff  Compaq Bluetooth Multiport Module
@@ -1550,7 +1553,7 @@
 	00da  eHome Infrared Receiver
 	00db  Natural Ergonomic Keyboard 4000 V1.0
 	00e1  Wireless Laser Mouse 6000 Reciever
-	00f4  LifeCam VX-6000.
+	00f4  LifeCam VX-6000 (SN9C20x + OV9650)
 	00f5  LifeCam VX-3000.
 	00f7  LifeCam VX-1000.
 	00f8  LifeCam NX-6000.
@@ -1696,6 +1699,8 @@
 	04ea  Windows Powered Smartphone 2003
 	0708  Transceiver v 3.0 for Bluetooth
 	070a  Charon Bluetooth Dongle (DFU)
+	0721  LifeCam NX-3000 (UVC-compliant)
+	0723  LifeCam VX-7000 (UVC-compliant)
 	930a  ISOUSB.SYS Intel 82930 Isochronous IO Test Board
 	fff8  Keyboard
 0460  Ace Cad Enterprise Co., Ltd
@@ -1911,6 +1916,7 @@
 	c03e  Premium Optical Wheel Mouse
 	c03f  UltraX Optical Mouse
 	c040  Corded Tilt-Wheel Mouse
+	c041  G5 Laser Mouse
 	c043  MX320 Laser Mouse
 	c044  LX3 Optical Mouse
 	c045  Optical Mouse
@@ -2072,6 +2078,7 @@
 	0809  AVNET Bluetooth Device
 	0811  JR24 CDRW
 	0815  eHome Infrared Receiver
+	0844  SA2111/02 1GB Flash Audio Player
 	1120  Creative Rhomba MP3 player
 	1125  Nike psa[128max Player
 	1137  HDD065 MP3 player
@@ -2814,6 +2821,7 @@
 	30f9  PowerShot A410 (PTP mode)
 	30fc  PowerShot A620 (PTP mode)
 	30fd  PowerShot A610 (normal mode)/PowerShot A610 (PTP mode)
+	30fe  Digital IXUS 65 (PTP mode)/PowerShot SD630 (PTP mode)
 	30ff  Digital IXUS 55 (PTP mode)/PowerShot SD450 (PTP mode)
 	310b  SELPHY CP600
 	310e  Digital IXUS 50 (PTP mode)
@@ -3588,6 +3596,7 @@
 	a122  ORITE CCD Webcam(PC370R)
 	a123  ORITE CCD Webcam(PC370R)
 	a124  ORITE CCD Webcam(PC370R)
+	a128  PC Camera (SN9C202 + OV7663 + EEPROM)
 	a133  Gateway Webcam
 	a204  DSC WIA Device (1300)
 	a208  DSC WIA Device (2320)
@@ -3605,6 +3614,7 @@
 	b028  VGA UVC WebCam
 04f3  Elan Microelectronics Corp.
 	0210  AM-400 Hama Optical Mouse
+	0212  Laser Mouse
 04f4  Harting Elektronik, Inc.
 04f5  Fujitsu-ICL Systems, Inc.
 04f6  Norand Corp.
@@ -3970,6 +3980,8 @@
 	a4a6  Linux-USB Serial Gadget
 	a4a7  Linux-USB Serial Gadget (CDC ACM mode)
 	a4a8  Linux-USB Printer Gadget
+	a4a9  Linux-USB OBEX Gadget
+	a4aa  Linux-USB CDC Composite Gadge (Ethernet and ACM)
 0526  Temic MHS S.A.
 0527  ALTRA
 0528  ATI Technologies, Inc.
@@ -4714,6 +4726,7 @@
 	2802  Monterey Keyboard
 	5492  Hub
 	6232  Hi-Speed 16-in-1 Flash Card Reader/Writer
+	6335  SD/MMC Card Reader
 	6360  Multimedia Card Reader
 	6361  Multimedia Card Reader
 	6362  Hi-Speed 21-in-1 Flash Card Reader/Writer (Internal/External)
@@ -5869,6 +5882,7 @@
 06ba  Smooth Cord & Connector Co., Ltd
 06bb  EDA, Inc.
 06bc  Oki Data Corp.
+	000b  Okipage 14ex Printer
 06bd  AGFA-Gevaert NV
 	0001  SnapScan 1212U
 	0002  SnapScan 1236U
@@ -6425,8 +6439,14 @@
 	0410  PowerMate
 	041a  PowerWave
 	07af  iMic
+	1016  AirClick
 	627a  Radio SHARK
 077f  Well Excellent & Most Corp.
+0780  Sagem Monetel GmbH
+	1202  ORGA 900 Smart Card Terminal Virtual Com Port
+	1302  ORGA 6000 Smart Card Terminal Virtual Com Port
+	1303  ORGA 6000 Smart Card Terminal USB RNDIS
+	df55  ORGA 900/6000 Smart Card Terminal DFU
 0781  SanDisk Corp.
 	0001  SDDR-05a ImageMate CompactFlash Reader
 	0002  SDDR-31 ImageMate II CompactFlash Reader
@@ -6443,7 +6463,7 @@
 	5150  SDCZ2 Cruzer Mini Flash Drive (thin)
 	5151  Cruzer Micro 256/512MB Flash Drive
 	5153  Cruzer USB-Flash-Drive
-	5406  Cruzer Micro 1/4GB Flash Drive
+	5406  Cruzer Micro 1/2/4GB Flash Drive
 	5408  Cruzer Titanium U3
 	6100  Ultra II SD Plus 2GB
 	7100  Cruzer Mini
@@ -6463,6 +6483,7 @@
 	7433  Sansa Clip (msc)
 	7450  Sansa C250
 	7451  Sansa C240
+	7460  Sansa Express
 	7480  Sansa Connect
 	7481  Sansa Connect (in recovery mode)
 	8181  Pen Flash
@@ -7040,23 +7061,25 @@
 	0001  Rio 500
 0844  Welland Industrial Co., Ltd
 0846  NetGear, Inc.
-	1001  EA101 Ethernet [klsi]
+	1001  EA101 10 Mbps 10BASE-T Ethernet [Kawasaki LSI KL5KLUSB101B]
 	1002  Ethernet
-	1020  Ethernet 10/100, USB1.1
-	1040  USB 2.0 Ethernet
-	4110  MA111 WiFi (v1)
-	4200  WG121 WiFi (v1)
-	4210  WG121 WiFi (v2)
-	4220  WG111 WiFi (v1)
-	4230  MA111 WiFi (v2)
-	4240  WG111 WiFi (v2)
-	4260  WG111v3 802.11g Adapter [realtek RTL8187B]
-	4300  WG111U
-	4301  WG111U (no firmware)
-	6a00  WG111 WiFi (v2)
-	7100  WN121T Wireless Adapter
-	9000  RangeMax NEXT Wireless-N Adapter WN111
-	a001  PA101 Phoneline10X Adapter
+	1020  FA101 Fast Ethernet USB 1.1 
+	1040  FA120 Fast Ethernet USB 2.0 [Asix AX88172 / AX8817x]
+	4110  MA111(v1) 802.11b Wireless [Intersil Prism 3.0] 
+	4200  WG121(v1) 54 Mbps Wireless [Intersil Prism GT]
+	4210  WG121(v2) 54 Mbps Wireless [Intersil Prism GT]
+	4220  WG111(v1) 54 Mbps Wireless [Intersil Prism54 Intersil 3886]
+	4230  MA111(v2) 802.11b Wireless [SIS SIS 162]
+	4240  WG111v2 54 Mbps Wireless [RealTek RTL8187L]
+	4260  WG111v3 54 Mbps Wireless [realtek RTL8187B]
+	4300  WG111U Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX]
+	4301  WG111U (no firmware) Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] 
+	6a00  WG111v2 54 Mbps Wireless [RealTek RTL8187L] 
+	7100  WN121T RangeMax Next Wireless-N [Marvell TopDog]
+	9000  WN111(v1) RangeMax Next Wireless [Marvell TopDog]
+	9001  WN111(v2) RangeMax Next Wireless [Atheros AR9001U-(2)NG]
+	9010  WNDA3100 RangeMax Dual Band Wireless-N [Atheros AR9001U-2NX] 
+	a001  PA101 10 Mbps HPNA Home Phoneline RJ-1
 084d  Minton Optic Industry Co., Inc.
 	0001  Jenoptik JD800i
 	0003  S-Cam F5 Digital Camera
@@ -8037,6 +8060,10 @@
 	030a  POS Printer, TH200B
 	0400  Lottery Scanner, Xiscan S
 	0401  Lottery Scanner, Xiscan 3
+	0402  Programmable Magnetic Swipe Card Reader, MSRP-USB
+	0500  IDE Adapter
+	0501  Hub Printer Interface
+	0502  Hub SNIKey Keyboard
 	4304  Banking Printer TP07
 0aa8  TriGem Computer, Inc.
 	0060  TG 11Mbps WLAN Mini Adapter
@@ -8057,7 +8084,8 @@
 0aaf  Digitalway Co., Ltd
 0ab0  Arrow Strong Electronics Co., Ltd
 0aba  Ellisys
-	8001  USB Tracker 110 Protocol Analyzer
+	8001  Tracker 110 Protocol Analyzer
+	8002  Explorer 200 Protocol Analyzer
 0abe  Stereo-Link
 	0101  SL1200 DAC
 0ac3  Sanyo Semiconductor Company Micro
@@ -8278,6 +8306,8 @@
 0b87  Plus-One I & T, Inc.
 0b88  Sigma Koki Co., Ltd, Technology Center
 0b89  Advanced Digital Broadcast, Ltd
+0b8c  SMART Technologies Inc.
+	00c3  Sympodium ID350
 0b95  ASIX Electronics Corp.
 	1720  10/100 Ethernet
 	1780  AX88178
@@ -8722,8 +8752,9 @@
 	60fe  Audio (Microphone)
 	6108  Win2 PC Camera
 	6122  PC Camera (SN9C110)
+	6128  PC Camera (SN9C325 + OM6802)
 	6123  PC Camera (SN9C110)
-	612a  PC Camera (SN9C110)
+	612a  PC Camera (SN9C325)
 	612c  PC Camera (SN9C110)
 	612e  PC Camera (SN9C110)
 	612f  PC Camera (SN9C110)
@@ -8733,34 +8764,39 @@
 	613b  Win2 PC Camera
 	613c  PC Camera (SN9C120)
 	613e  PC Camera (SN9C120)
-	6240  PC Camera (SN9C201)
-	6242  PC Camera (SN9C201)
-	6243  PC Camera (SN9C201)
-	6248  PC Camera (SN9C201)
-	624b  PC Camera (SN9C201)
-	624c  PC Camera (SN9C201)
-	624e  PC Camera (SN9C201)
-	624f  PC Camera (SN9C201)
-	6260  PC Camera (SN9C201)
-	6270  U-CAM PC Camera NE878
-	627a  PC Camera (SN9C201)
-	627b  PC Camera (SN9C201)
-	627c  PC Camera (SN9C201)
-	627f  PC Camera (SN9C201)
-	6280  Composite Device
-	6282  Audio (Microphone)
-	6283  Audio (Microphone)
-	6288  Audio (Microphone)
-	628a  Composite Device
-	628b  PC Camera (SN9C202)
-	628c  PC Camera (SN9C202)
-	628e  Composite Device
-	628f  Composite Device
-	62a0  Audio (Microphone)
-	62b0  Audio (Microphone)
-	62ba  PC Camera (SN9C202)
-	62bb  PC Camera (SN9C202)
-	62bc  Composite Device
+	6240  PC Camera (SN9C201 + MI1300)
+	6242  PC Camera (SN9C201 + MI1310)
+	6243  PC Camera (SN9C201 + S5K4AAFX)
+	6248  PC Camera (SN9C201 + OV9655)
+	624b  PC Camera (SN9C201 + CX1332)
+	624c  PC Camera (SN9C201 + MI1320)
+	624e  PC Camera (SN9C201 + SOI968)
+	624f  PC Camera (SN9C201 + OV9650)
+	6253  PC Camera (SN9C201 + OV9650)
+	6260  PC Camera (SN9C201 + OV7670ISP)
+	6262  PC Camera (SN9C201 + OM6802)
+	6270  PC Camera (SN9C201 + MI0360/MT9V011 or MI0360SOC/MT9V111) U-CAM PC Camera NE878, Whitcom WHC017, ...
+	627a  PC Camera (SN9C201 + S5K53BEB)
+	627b  PC Camera (SN9C201 + OV7660)
+	627c  PC Camera (SN9C201 + HV7131R)
+	627f  PC Camera (SN9C201 + OV965x + EEPROM)
+	6280  PC Camera with Microphone (SN9C202 + MI1300)
+	6282  PC Camera with Microphone (SN9C202 + MI1310)
+	6283  PC Camera with Microphone (SN9C202 + S5K4AAFX)
+	6288  PC Camera with Microphone (SN9C202 + OV9655)
+	628a  PC Camera with Microphone (SN9C202 + ICM107)
+	628b  PC Camera with Microphone (SN9C202 + CX1332)
+	628c  PC Camera with Microphone (SN9C202 + MI1320)
+	628e  PC Camera with Microphone (SN9C202 + SOI968)
+	628f  PC Camera with Microphone (SN9C202 + OV9650)
+	62a0  PC Camera with Microphone (SN9C202 + OV7670ISP)
+	62a2  PC Camera with Microphone (SN9C202 + OM6802)
+	62b0  PC Camera with Microphone (SN9C201 + MI0360/MT9V011 or MI0360SOC/MT9V111)
+	62b3  PC Camera with Microphone (SN9C202 + OV9655)
+	62ba  PC Camera with Microphone (SN9C202 + S5K53BEB)
+	62bb  PC Camera with Microphone (SN9C202 + OV7660)
+	62bc  PC Camera with Microphone (SN9C202 + HV7131R)
+	62be  PC Camera with Microphone (SN9C202 + OV7663)
 	62c0  Pavilion Webcam
 	8000  DC31VC
 	8006  Dual Mode Camera (8006 VGA)
@@ -9332,6 +9368,7 @@
 	0722  Bluetooth Dongle
 	0800  Data Cable
 	0820  Data Cable
+	0900  MA i-gotU Travel Logger GPS
 	1800  Generic Card Reader
 	1802  Card Reader
 0dfa  Toyo Communication Equipment Co., Ltd
@@ -9641,6 +9678,7 @@
 	db01  FusionHDTV DVB-T (MT352+LgZ201) (initialized)
 	db10  FusionHDTV DVB-T (MT352+Thomson7579) (uninitialized)
 	db11  FusionHDTV DVB-T (MT352+Thomson7579) (initialized)
+	db78  FusionHDTV DVB-T Dual Digital 4 (ZL10353+xc2028/xc3028) (initialized)
 0fea  United Computer Accessories
 0feb  CRS Electronic Co., Ltd
 0fec  UMC Electronics Co., Ltd
@@ -9747,6 +9785,8 @@
 	9967  W9967CF/W9968CF WebCam IC
 1048  Targus Group International
 104c  AMCO TEC International, Inc.
+1050  Yubico.com
+	0010  Yubikey
 1053  Immanuel Electronics Co., Ltd
 1054  BMS International Beheer N.V.
 	5004  DSL 7420 Loader
@@ -9925,7 +9965,7 @@
 10d6  Actions Semiconductor Co., Ltd
 	1000  MP3 Player
 	1100  MPMan MP-Ki 128 MP3 Player/Recorder
-	1101  D-Wave 2GB MP4 Player
+	1101  D-Wave 2GB MP4 Player / AK1025 MP3/MP4 Player
 	8888  ADFU Device
 	ff51  ADFU Device
 10de  Authenex, Inc.
@@ -9997,7 +10037,8 @@
 115b  Salix Technology Co., Ltd.
 1162  Secugen Corp.
 1163  DeLorme Publishing, Inc.
-	0100  Earthmate GPS
+	0100  Earthmate GPS (orig)
+	0200  Earthmate GPS (LT-20, LT-40)
 1164  YUAN High-Tech Development Co., Ltd
 	0300  ELSAVISION 460D
 	0601  Analog TV Tuner
@@ -10223,6 +10264,8 @@
 	0023  WUSB54GR
 	0024  WUSBF54G v1.1 802.11g Adapter w/ Wi-Fi Finder
 13b3  Nippon Dics Co., Ltd.
+13ba  Unknown
+	0017  PS/2 Keyboard+Mouse Adapter
 13be  Ricoh Printing Systems, Ltd.
 13ca  JyeTai Precision Industrial Co., Ltd.
 13cf  Wisair Ltd.
@@ -10291,6 +10334,8 @@
 	2000  Sony Playstation Eye
 1419  ABILITY ENTERPRISE CO., LTD.
 1429  Vega Technologies Industrial (Austria) Co.
+142a  Thales E-Transactions
+	0043  medCompact
 1430  RedOctane
 1431  Pertech Resources, Inc.
 1435  Wistron NeWeb
@@ -10301,6 +10346,8 @@
 	0829  AR5523 (no firmware)
 1436  Denali Software, Inc.
 143c  Altek Corporation
+145f  Unknown
+	013d  PC Camera (SN9C201 + OV7660)
 1453  Radio Shack
 	4026  26-183 Serial Cable
 1456  Extending Wire & Cable Co., Ltd.
@@ -10394,6 +10441,8 @@
 	0007  DeathAdder Mouse
 	0102  Tarantula Keyboard
 1546  U-Blox AG
+154a  Celectronic GmbH
+	8180  CARD STAR/medic2
 154b  PNY
 	0010  USB 2.0 Flash Drive
 154d  ConnectCounty Holdings Berhad
@@ -10554,6 +10603,8 @@
 	0311  Watchport/Hc
 	1403  MultiTech Systems MT4X56 Modem
 	1a17  Agilent Technologies (E6473)
+1614  Amoi Electronics
+	0404  WMA9109 UMTS Phone
 1619  L & K Precision Technology Co., Ltd.
 1621  Wionics Research
 1628  Stonestreet One, Inc.
@@ -10612,6 +10663,8 @@
 	2001  Beagle USB 12 Protocol Analyzer
 1682  Maxwise Production Enterprise Ltd.
 1684  Godspeed Computer Corp.
+1685  Delock
+	0200  Infrared adapter
 1686  ZOOM Corporation
 	0045  H4 Digital Recorder
 1687  Kingmax Digital Inc.
@@ -10758,7 +10811,9 @@
 	0002  CG-WLUSB2GO
 18d5  Starline International Group Limited
 18d9  Kaba
-	01xy  LEGIC advant desktop reader
+	01a0  B-Net 91 07
+18dd  Planon System Solutions Inc.
+	1000  DocuPen RC800
 18e3  Fitipower Integrated Technology Inc
 18e8  Qcom
 	6196  RT2573
@@ -10775,6 +10830,8 @@
 192f  Avago Technologies, Pte.
 1930  Shenzhen Xianhe Technology Co., Ltd.
 1931  Ningbo Broad Telecommunication Co., Ltd.
+1941  Dream Link
+	8021  USB Missile Launcher
 1949  Lab126
 1951  Hyperstone AG
 1953  Ironkey Inc.
@@ -10806,6 +10863,8 @@
 19ca  Mindtribe
 	0001  Sandio 3D HID Mouse
 19cf  Parrot SA
+19d2  ONDA Communication S.p.A.
+	0002  MT505UP MF632
 19e1  WeiDuan Electronic Accessory (S.Z.) Co., Ltd.
 19e8  Industrial Technology Research Institute
 19ef  Pak Heng Technology (Shenzhen) Co., Ltd.
@@ -10820,6 +10879,8 @@
 1a36  Biwin Technology Ltd.
 1a40  TERMINUS TECHNOLOGY INC.
 1a41  Action Electronics Co., Ltd.
+1a44  VASCO Data Security International
+	0001  Digipass 905 SmartCard Reader
 1a4a  Silicon Image
 1a4b  SafeBoot International B.V.
 1a61  Abbott Diabetes Care
@@ -11022,6 +11083,7 @@
 	0001  1.1 root hub
 	0002  2.0 root hub
 	0003  3.0 root hub
+1e1f  INVIA
 1e29  Festo AG & Co. KG
 	0101  CPX Adapter
 1ebb  NuCORE Technology, Inc.
@@ -11086,7 +11148,10 @@
 2040  Hauppauge
 	6502  WinTV HVR-900
 	6503  WinTV HVR-930
+	6513  WinTV HVR-980
 	7050  Nova-T Stick
+	7060  Nova-T Stick 2
+	7070  Nova-T Stick 3
 	9300  WinTV NOVA-T USB2 (cold)
 	9301  WinTV NOVA-T USB2 (warm)
 2101  ActionStar
@@ -11177,6 +11242,7 @@
 	6415  ROKR Z6 (MTP mode)
 	6604  Washington CDMA Phone
 	6631  CDC Modem
+	7001  Q Smartphone
 22b9  eTurboTouch Technology, Inc.
 22ba  Technology Innovation Holdings, Ltd
 2304  Pinnacle Systems, Inc. [hex]
@@ -11562,11 +11628,14 @@ a727  3Com
 	6897  AR5523
 c251  Keil Software, Inc.
 	2710  ULink
+d209  Ultimarc
+	0301  I-PAC Arcade Control Interface
 eb1a  eMPIA Technology, Inc.
 	17de  KWorld V-Stream XPERT DTV - DVB-T USB cold
 	17df  KWorld V-Stream XPERT DTV - DVB-T USB warm
 	2710  SilverCrest WebCam
 	2750  ECS Elitegroup G220 integrated webcam
+	2761  EeePC 701 integrated webcam
 	2800  Terratec Cinergy 200
 	2801  GrabBeeX+ Video Encoder
 f003  Hewlett Packard