Update.

diff --git a/oui.txt b/oui.txt
index 5baeea1a24b484d9f5993b9f32883cedde0f355a..1716e238614e9855fead4948cdf0efe52d10d634 100644 (file)
--- a/oui.txt
+++ b/oui.txt
@@ -67898,8 +67898,8 @@
                                HSINCHU  
                                TAIWAN, PROVINCE OF CHINA
 
-  00-50-C8   (hex)              Addonics Technologies, Inc.
-  0050C8     (base 16)          Addonics Technologies, Inc.
+  00-50-C8   (hex)             Addonics Technologies, Inc.
+  0050C8     (base 16)         Addonics Technologies, Inc.
                                1918 Junction Ave.,
                                San Jose CA 95131
                                UNITED STATES
@@ -77610,8 +77610,8 @@
                                SAN DIEGO CA 92121-2733
                                UNITED STATES
 
-  00-D0-76   (hex)              Bank of America
-  00D076     (base 16)          Bank of America
+  00-D0-76   (hex)             Bank of America
+  00D076     (base 16)         Bank of America
                                1100 Merrill Drive
                                Pennington NJ 08534
                                UNITED STATES
@@ -81747,8 +81747,8 @@
                                CANADA L5N L5N 3C9
                                CANADA
 
-  08-00-81   (hex)             ,ASTECH INC.
-  080081     (base 16)         ,ASTECH INC.
+  08-00-81   (hex)             ASTECH INC.
+  080081     (base 16)         ASTECH INC.
                                670 NORTH COMMERCIAL STREET
                                MANCHESTER NH 03101
                                UNITED STATES
@@ -82342,8 +82342,8 @@
                                ShenZhen GuangDong 518100
                                CHINA
 
-  08-ED-B9   (hex)              Hon Hai Precision Ind. Co.,Ltd.
-  08EDB9     (base 16)          Hon Hai Precision Ind. Co.,Ltd.
+  08-ED-B9   (hex)             Hon Hai Precision Ind. Co.,Ltd.
+  08EDB9     (base 16)         Hon Hai Precision Ind. Co.,Ltd.
                                NO.1925,Nanle Road ,Songjiang Export Processing Zone
                                 Shanghai  201613
                                CHINA
@@ -83165,8 +83165,8 @@
                                Gumi Gyeongbuk 730-350
                                KOREA, REPUBLIC OF
 
-  10-3D-EA   (hex)              HFC Technology (Beijing) Ltd. Co.
-  103DEA     (base 16)          HFC Technology (Beijing) Ltd. Co.
+  10-3D-EA   (hex)             HFC Technology (Beijing) Ltd. Co.
+  103DEA     (base 16)         HFC Technology (Beijing) Ltd. Co.
                                Building #3, Room 1214
                                Zhongguancun Software Park (ZPARK)
                                Beijing AP (Area Pacific) 100193
@@ -83348,6 +83348,13 @@
                                Taoyuan County  325-44
                                TAIWAN, PROVINCE OF CHINA
 
+  10-7B-EF   (hex)             ZyXEL Communications Corp
+  107BEF     (base 16)         ZyXEL Communications Corp
+                               No. 6 Innovation Road II
+                               Science Park
+                               Hsichu  300
+                               TAIWAN, PROVINCE OF CHINA
+
   10-83-D2   (hex)             Microseven Systems, LLC
   1083D2     (base 16)         Microseven Systems, LLC
                                404 South Lemon Ave., #9
@@ -83791,6 +83798,12 @@
                                San Diego CA 92121
                                UNITED STATES
 
+  14-60-80   (hex)             zte corporation
+  146080     (base 16)         zte corporation
+                               12/F.,zte R&D building ,kejinan Road
+                               shenzhen guangdong 518057
+                               CHINA
+
   14-63-08   (hex)             JABIL CIRCUIT (SHANGHAI) LTD.
   146308     (base 16)         JABIL CIRCUIT (SHANGHAI) LTD.
                                FL5-UNIT A2 NO. 1528 GUMEI ROAD
@@ -87796,6 +87809,12 @@
                                Kungsaengen  196 22
                                SWEDEN
 
+  34-5C-40   (hex)             Cargt Holdings LLC
+  345C40     (base 16)         Cargt Holdings LLC
+                               8820 Hillside Dr
+                               Lenexa KANSAS (KS) 66227
+                               UNITED STATES
+
   34-61-78   (hex)             The Boeing Company
   346178     (base 16)         The Boeing Company
                                325 James S. McDonnell Blvd
@@ -87885,6 +87904,13 @@
                                Münster NRW 48163
                                GERMANY
 
+  34-88-5D   (hex)             Logitech Far East
+  34885D     (base 16)         Logitech Far East
+                               #2 Creation Rd. 4,
+                               Science-Based Ind. Park
+                               Hsinchu  300
+                               TAIWAN, PROVINCE OF CHINA
+
   34-95-DB   (hex)             Logitec Corporation
   3495DB     (base 16)         Logitec Corporation
                                8268 Rokudohara, Misuzu
@@ -90600,8 +90626,8 @@
                                Hangzhou Zhejiang 310053
                                CHINA
 
-  48-EB-30   (hex)              ETERNA TECHNOLOGY, INC.
-  48EB30     (base 16)          ETERNA TECHNOLOGY, INC.
+  48-EB-30   (hex)             ETERNA TECHNOLOGY, INC.
+  48EB30     (base 16)         ETERNA TECHNOLOGY, INC.
                                3939 veselich ave
                                317
                                los angeles california 90039
@@ -93484,8 +93510,8 @@
                                Herlev DK 2730
                                DENMARK
 
-  60-C3-97   (hex)             2 Wire Inc
-  60C397     (base 16)         2 Wire Inc
+  60-C3-97   (hex)             2Wire Inc
+  60C397     (base 16)         2Wire Inc
                                1764 Automation Parkway
                                San Jose CA 95131
                                UNITED STATES
@@ -96264,6 +96290,13 @@
                                Seneca PA 16346
                                UNITED STATES
 
+  74-A4-B5   (hex)             Powerleader Science and Technology Co. Ltd.
+  74A4B5     (base 16)         Powerleader Science and Technology Co. Ltd.
+                               Powerleader Technology Park, #3 Guanyi Rd.
+                               Guanlan Hi-Tech Park, Longhua New Area
+                               Shenzhen Guangdong 518110
+                               CHINA
+
   74-A7-22   (hex)             LG Electronics
   74A722     (base 16)         LG Electronics
                                603-39 , Kasan-dong, Gumcheon-gu
@@ -98346,6 +98379,12 @@
                                Gumi Gyeongbuk 730-350
                                KOREA, REPUBLIC OF
 
+  84-26-2B   (hex)             Alcatel-Lucent
+  84262B     (base 16)         Alcatel-Lucent
+                               600 March Road
+                               Kanata Ontario K2K 2E6
+                               CANADA
+
   84-27-CE   (hex)             Corporation of the Presiding Bishop of The Church of Jesus Christ of Latter-day Saints
   8427CE     (base 16)         Corporation of the Presiding Bishop of The Church of Jesus Christ of Latter-day Saints
                                Audiovisual Engineering - 2LL
@@ -98919,6 +98958,13 @@
                                Shenzhen Guangdong 518057
                                CHINA
 
+  88-57-6D   (hex)             XTA Electronics Ltd
+  88576D     (base 16)         XTA Electronics Ltd
+                               The Design House
+                               Worcester Road
+                               Stourport-on-Severn Worcestershire DY13 9BZ
+                               UNITED KINGDOM
+
   88-5C-4F   (hex)             Alcatel Lucent
   885C4F     (base 16)         Alcatel Lucent
                                Via trento, 30
@@ -99618,6 +99664,13 @@
                                Suwon Gyeonggi-do 443742
                                KOREA, REPUBLIC OF
 
+  8C-CD-A2   (hex)             ACTP, Inc.
+  8CCDA2     (base 16)         ACTP, Inc.
+                               2400 Sand Lake Rd
+                               #600
+                               Orlando FL 32809
+                               UNITED STATES
+
   8C-CD-E8   (hex)             Nintendo Co., Ltd.
   8CCDE8     (base 16)         Nintendo Co., Ltd.
                                11-1 HOKOTATE-CHO
@@ -101073,6 +101126,12 @@
                                Middleton WI 53562
                                UNITED STATES
 
+  98-6C-F5   (hex)             zte corporation
+  986CF5     (base 16)         zte corporation
+                               12/F.,zte R&D building ,kejinan Road
+                               shenzhen guangdong 518057
+                               CHINA
+
   98-6D-C8   (hex)             TOSHIBA MITSUBISHI-ELECTRIC INDUSTRIAL SYSTEMS CORPORATION
   986DC8     (base 16)         TOSHIBA MITSUBISHI-ELECTRIC INDUSTRIAL SYSTEMS CORPORATION
                                MITA 43MT BLDG.
@@ -101697,6 +101756,12 @@
                                Wateringen Zuid Holland 2292JC
                                NETHERLANDS
 
+  9C-B6-54   (hex)             Hewlett Packard
+  9CB654     (base 16)         Hewlett Packard
+                               11445 Compaq Center Drive
+                               Houston Texas 77070
+                               UNITED STATES
+
   9C-B7-0D   (hex)             Liteon Technology Corporation
   9CB70D     (base 16)         Liteon Technology Corporation
                                4F,90,Chien 1 Road, ChungHo.
@@ -101710,6 +101775,13 @@
                                Kunshan Jiangsu 201203
                                CHINA
 
+  9C-BB-98   (hex)             Shen Zhen RND Electronic Co.,LTD
+  9CBB98     (base 16)         Shen Zhen RND Electronic Co.,LTD
+                               G315,Hua Chuang Da business Certer
+                               ,BaoAn 42 District,
+                               Shen Zhen Guang Dong 518000
+                               CHINA
+
   9C-C0-77   (hex)             PrintCounts, LLC
   9CC077     (base 16)         PrintCounts, LLC
                                5109 W Lemon St
@@ -102297,8 +102369,8 @@
                                Seoul  135-833
                                KOREA, REPUBLIC OF
 
-  A0-C3-DE   (hex)              Triton Electronic Systems Ltd.
-  A0C3DE     (base 16)          Triton Electronic Systems Ltd.
+  A0-C3-DE   (hex)             Triton Electronic Systems Ltd.
+  A0C3DE     (base 16)         Triton Electronic Systems Ltd.
                                620063, Ekaterinburg, P/O box 522
                                Ekaterinburg Sverdlovskaya obl. 620063
                                RUSSIAN FEDERATION
@@ -104776,6 +104848,12 @@
                                Gumi Gyeongbuk 730-350
                                KOREA, REPUBLIC OF
 
+  B4-62-AD   (hex)             raytest GmbH
+  B462AD     (base 16)         raytest GmbH
+                               Benzstr. 4
+                               Straubenhardt Baden-Wuerttemberg 75334
+                               GERMANY
+
   B4-67-E9   (hex)             Qingdao GoerTek Technology Co., Ltd.
   B467E9     (base 16)         Qingdao GoerTek Technology Co., Ltd.
                                5F, No.3 Building, Fortune Center
@@ -113874,6 +113952,13 @@
                                Hukou, Hsinchu  30352
                                TAIWAN, PROVINCE OF CHINA
 
+  F8-3D-4E   (hex)             Softlink Automation System Co., Ltd
+  F83D4E     (base 16)         Softlink Automation System Co., Ltd
+                               No.12, Hi-tech South 7th Rd.,
+                               Hi-tech Park, Nanshan Dist.
+                               Shenzhen GuangDong 518057
+                               CHINA
+
   F8-3D-FF   (hex)             Huawei Technologies Co., Ltd
   F83DFF     (base 16)         Huawei Technologies Co., Ltd
                                Building 17,Nangang Industrial Park, Tangtou 3nd Industrial Estate,Shiyan Baoan District
@@ -114074,8 +114159,8 @@
                                SEOUL  135-928
                                KOREA, REPUBLIC OF
 
-  F8-97-CF   (hex)              DAESHIN-INFORMATION TECHNOLOGY CO., LTD.
-  F897CF     (base 16)          DAESHIN-INFORMATION TECHNOLOGY CO., LTD.
+  F8-97-CF   (hex)             DAESHIN-INFORMATION TECHNOLOGY CO., LTD.
+  F897CF     (base 16)         DAESHIN-INFORMATION TECHNOLOGY CO., LTD.
                                6F, Chungwon Bldg., 828-5 Yuksam-Dong,Kangnam-Gu,
                                Seoul  135935
                                KOREA, REPUBLIC OF
@@ -114742,6 +114827,13 @@
                                Leonberg BW 71206
                                GERMANY
 
+  FC-D8-17   (hex)             Beijing Hesun Technologies Co.Ltd.
+  FCD817     (base 16)         Beijing Hesun Technologies Co.Ltd.
+                               Room 1811, 18th floor, Building No. 4, Courtyard 1, Shangdi tenth Street
+                               Haidian District
+                               Beijing 100085
+                               CHINA
+
   FC-DB-96   (hex)             ENERVALLEY CO., LTD
   FCDB96     (base 16)         ENERVALLEY CO., LTD
                                907-101 DIGITAL EMPIRE II

diff --git a/pci.ids b/pci.ids
index a1755bdf1414d468402da4841c70a946a9e89fec..6723e2acb35b96534c276f58c88be9923f0d0213 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2013.07.25
-#      Date:    2013-07-25 03:15:01
+#      Version: 2013.07.26
+#      Date:    2013-07-26 03:15:02
 #
 #      Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #      PCI ID Project at http://pci-ids.ucw.cz/.
@@ -15661,6 +15661,8 @@
                1657 0022  10Gbps CNA - FCOE
                1657 0023  10Gbps CNA - LL
                1657 0024  16Gbps FC HBA
+# Mezz card for IBM
+       0023  1869 16Gbps FC HBA
 # Same Device_ID used for 410 (1port) and 420 (2 port) HBAs.
        0646  400 4Gbps PCIe FC HBA
 165a  Epix Inc
@@ -17742,6 +17744,10 @@
        1025  16 photo couple 16 relay Card
        4000  WatchDog Card
 6688  Zycoo Co., Ltd
+       1200  CooVOX TDM Analog Module
+       1400  CooVOX TDM GSM Module
+       1600  CooVOX TDM E1/T1 Module
+       1800  CooVOX TDM BRI Module
 # nee Qumranet
 6900  Red Hat, Inc.
 7063  pcHDTV
@@ -19205,13 +19211,16 @@
                8086 7b11  10GbE 2P X520 Adapter
        1557  82599 10 Gigabit Network Connection
                8086 0001  Ethernet OCP Server Adapter X520-1
+       1558  Ethernet Converged Network Adapter X520-Q1
+               8086 011a  Ethernet Converged Network Adapter X520-Q1
+               8086 011b  Ethernet Converged Network Adapter X520-Q1
        1559  Ethernet Connection I218-V
        155a  Ethernet Connection I218-LM
        155c  Ethernet Server Bypass Adapter
                8086 0001  Ethernet Server Bypass Adapter X540-T2
        155d  Ethernet Server Bypass Adapter
                8086 0001  Ethernet Server Bypass Adapter X520-SR2
-       1560  Ethernet Controller X540-AT1
+       1560  Ethernet Controller X540
        157b  I210 Gigabit Network Connection
        15a0  Ethernet Connection (2) I218-LM
        15a1  Ethernet Connection (2) I218-V