Update.

diff --git a/iab.txt b/iab.txt
index 337edc546c844a19075757da4cc4942cb71e4067..a220aba4f7afba512bc37cccee47e95d756474a1 100644 (file)
--- a/iab.txt
+++ b/iab.txt
@@ -1,4 +1,4 @@
-  Generated: Tue, 22 Jul 2014 05:00:03 -0400
+  Generated: Fri, 01 Aug 2014 05:00:02 -0400
 
   OUI                          Organization
   IAB Range                            Organization

diff --git a/oui.txt b/oui.txt
index 2c8720f5cf0b238bf3da3040d969db8ed4dd27cd..89da6afbc998d7f7d277e945d4da4036c5bade22 100644 (file)
--- a/oui.txt
+++ b/oui.txt
@@ -1,4 +1,4 @@
-  Generated: Tue, 22 Jul 2014 05:00:03 -0400
+  Generated: Fri, 01 Aug 2014 05:00:02 -0400
 
   OUI/MA-L                     Organization
   company_id                   Organization
@@ -52685,10 +52685,10 @@
                                D-85586 POING
                                GERMANY
 
-  00-20-85   (hex)             EXIDE ELECTRONICS
-  002085     (base 16)         EXIDE ELECTRONICS
-                               P.O. BOX  58189
-                               RALEIGH NC 27658
+  00-20-85   (hex)             Eaton Corporation
+  002085     (base 16)         Eaton Corporation
+                               8380 Capital Blvd.
+                               RALEIGH NC 27616
                                UNITED STATES
 
   00-20-86   (hex)             MICROTECH ELECTRONICS LIMITED
@@ -71342,7 +71342,7 @@
 
   00-80-D9   (hex)             EMK Elektronik GmbH & Co. KG
   0080D9     (base 16)         EMK Elektronik GmbH & Co. KG
-                               Obere Bergstrasse 16
+                               Obere Bergstrasse 28
                                75335 Dobel 
                                GERMANY
 
@@ -74911,6 +74911,13 @@
                                Nuremberg Bavaria 90482
                                GERMANY
 
+  00-A2-F5   (hex)             Guangzhou Yuanyun Network Technology Co.,Ltd
+  00A2F5     (base 16)         Guangzhou Yuanyun Network Technology Co.,Ltd
+                               31/F,183 TianHe Bei Rd, Metro Plz
+                               TianHe District, GuangZhou City
+                               GuangZhou GuangDong 510630
+                               CHINA
+
   00-A2-FF   (hex)             abatec group AG
   00A2FF     (base 16)         abatec group AG
                                Oberregauerstraße 48
@@ -82675,12 +82682,25 @@
                                TAINAN  70268
                                TAIWAN, PROVINCE OF CHINA
 
+  08-E8-4F   (hex)             HUAWEI TECHNOLOGIES CO.,LTD
+  08E84F     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
+                               D1,Huawei Industrial Base,
+                               Bantian, Longang
+                               Shenzhen Guangdong 518129
+                               CHINA
+
   08-EA-44   (hex)             Aerohive Networks, Inc.
   08EA44     (base 16)         Aerohive Networks, Inc.
                                330 Gibraltar Drive
                                Sunnyvale CA 94089
                                UNITED STATES
 
+  08-EB-29   (hex)             Jiangsu Huitong Group Co.,Ltd.
+  08EB29     (base 16)         Jiangsu Huitong Group Co.,Ltd.
+                               No. 24, Block 2, Taohuawu New District
+                               Zhenjiang Jiangsu 212003
+                               CHINA
+
   08-EB-74   (hex)             Humax
   08EB74     (base 16)         Humax
                                HUMAX Village, 11-4, Sunae-dong, Bundang-gu
@@ -83509,6 +83529,13 @@
                                San Jose CA 95134
                                UNITED STATES
 
+  10-08-B1   (hex)             Hon Hai Precision Ind. Co.,Ltd.
+  1008B1     (base 16)         Hon Hai Precision Ind. Co.,Ltd.
+                               Building D21,No.1, East Zone 1st Road
+                               Xiyong Town,Shapingba District
+                               Chongqing 401332
+                               CHINA
+
   10-09-0C   (hex)             Janome Sewing Machine Co., Ltd.
   10090C     (base 16)         Janome Sewing Machine Co., Ltd.
                                1463 Hazama-Machi
@@ -85953,6 +85980,12 @@
                                Bradenton Florida 34203
                                UNITED STATES
 
+  1C-96-5A   (hex)             Weifang goertek Electronics CO.,LTD
+  1C965A     (base 16)         Weifang goertek Electronics CO.,LTD
+                               Gaoxin 2 Road,Free Trade Zone
+                               Wei Fang Shan Dong 261205
+                               CHINA
+
   1C-97-3D   (hex)             PRICOM Design
   1C973D     (base 16)         PRICOM Design
                                2755 Slocum Rd
@@ -85972,6 +86005,12 @@
                                Madrid 28046
                                SPAIN
 
+  1C-9E-CB   (hex)             Beijing Nari Smartchip Microelectronics Company Limited
+  1C9ECB     (base 16)         Beijing Nari Smartchip Microelectronics Company Limited
+                               Northern Territory Xixiaokou Rd,Haidian district,Beijing 100192,China
+                               beijing beijing 100192
+                               CHINA
+
   1C-A2-B1   (hex)             ruwido austria gmbh
   1CA2B1     (base 16)         ruwido austria gmbh
                                Koestendorferstrasse 8
@@ -86506,6 +86545,13 @@
                                Sunnyvale CA 94085
                                UNITED STATES
 
+  20-76-93   (hex)             Lenovo (Beijing) Limited.
+  207693     (base 16)         Lenovo (Beijing) Limited.
+                               No.6 Chuang Ye Road Shangdi Information Industry Base,
+                               Haidian District
+                               Beijing 100085
+                               CHINA
+
   20-7C-8F   (hex)             Quanta Microsystems,Inc.
   207C8F     (base 16)         Quanta Microsystems,Inc.
                                No.5 Lane 91,Dongmei Rd.
@@ -88322,6 +88368,13 @@
                                ShenZhen GUANGDONG 518108
                                CHINA
 
+  2C-37-96   (hex)             CYBO CO.,LTD.
+  2C3796     (base 16)         CYBO CO.,LTD.
+                               218 MOO 3 LAEM CHA BANG
+                               INDUSTRIAL ESTATE, T.TUNGSUKLA
+                               SRIRACHA CHONBURI 20230
+                               THAILAND
+
   2C-39-96   (hex)             SAGEMCOM
   2C3996     (base 16)         SAGEMCOM
                                250 route de l'Empereur
@@ -88454,6 +88507,13 @@
                                Wingate  5019
                                NEW ZEALAND
 
+  2C-60-0C   (hex)             QUANTA COMPUTER INC.
+  2C600C     (base 16)         QUANTA COMPUTER INC.
+                               No.211, Wen Hwa 2nd Rd
+                               Kuei Shan Hsiang,Tao Yuan Shien
+                               Taoyuan Taiwan 33377
+                               TAIWAN, PROVINCE OF CHINA
+
   2C-62-5A   (hex)             Finest Security Systems Co., Ltd
   2C625A     (base 16)         Finest Security Systems Co., Ltd
                                12F, No.103, Sec3, Nan King E. RD
@@ -88807,7 +88867,8 @@
 
   2C-F7-F1   (hex)             Seeed Technology Inc.
   2CF7F1     (base 16)         Seeed Technology Inc.
-                                5th Floor, 8th Building, Shiling industrial Park, XiLi Town, NanShan dist. Shenzhen
+                                5th Floor, 8th Building, Shiling industrial Park
+                               XiLi Town,Nangang District
                                ShenZhen GuangDong 518055
                                CHINA
 
@@ -89660,6 +89721,12 @@
                                San Jose CA 95134
                                UNITED STATES
 
+  34-64-A9   (hex)             Hewlett Packard
+  3464A9     (base 16)         Hewlett Packard
+                               11445 Compaq Center Drive
+                               Houston Texas 77070
+                               UNITED STATES
+
   34-68-4A   (hex)             Teraworks Co., Ltd.
   34684A     (base 16)         Teraworks Co., Ltd.
                                Room No. 201 , 515-30 , Mok-Dong
@@ -91880,6 +91947,13 @@
                                Beijing  100195
                                CHINA
 
+  40-9B-0D   (hex)             Shenzhen Yourf Kwan Industrial Co., Ltd
+  409B0D     (base 16)         Shenzhen Yourf Kwan Industrial Co., Ltd
+                               MCN Edifice 5D, R1 Building, No.21 4th Hi-tech Road South, High-tech Industrial Park(south)
+                               Nanshan District
+                               Shenzhen Guangdong 518057
+                               CHINA
+
   40-9F-C7   (hex)             BAEKCHUN I&C Co., Ltd.
   409FC7     (base 16)         BAEKCHUN I&C Co., Ltd.
                                67-5, Gyesu-dong
@@ -93375,6 +93449,12 @@
                                Shanghai 201203
                                CHINA
 
+  4C-0B-BE   (hex)             Microsoft
+  4C0BBE     (base 16)         Microsoft
+                               1 Microsoft Way
+                               Redmond Washington 98052
+                               UNITED STATES
+
   4C-0D-EE   (hex)             JABIL CIRCUIT (SHANGHAI) LTD.
   4C0DEE     (base 16)         JABIL CIRCUIT (SHANGHAI) LTD.
                                FL5-UNIT A2 NO 1528 GUMEI ROAD
@@ -95587,6 +95667,12 @@
                                Qingdao Shandong 266071
                                CHINA
 
+  58-7F-B7   (hex)             SONAR INDUSTRIAL CO., LTD.
+  587FB7     (base 16)         SONAR INDUSTRIAL CO., LTD.
+                               29, 29/1, 29/2, MOO.3, THATALAD,
+                               SAMPRAN NAKORN PATHOM 73110
+                               THAILAND
+
   58-7F-C8   (hex)             S2M
   587FC8     (base 16)         S2M
                                2 rue des champs
@@ -96010,6 +96096,12 @@
                                Sydney NSW 2113
                                AUSTRALIA
 
+  5C-2B-F5   (hex)             Vivint
+  5C2BF5     (base 16)         Vivint
+                               4931 N 300 W
+                               Provo UT 84604
+                               UNITED STATES
+
   5C-2E-59   (hex)             Samsung Electronics Co.,Ltd
   5C2E59     (base 16)         Samsung Electronics Co.,Ltd
                                #94-1, Imsoo-Dong
@@ -96577,6 +96669,13 @@
                                New Taipei City,  231
                                TAIWAN, PROVINCE OF CHINA
 
+  60-04-17   (hex)             POSBANK CO.,LTD
+  600417     (base 16)         POSBANK CO.,LTD
+                               Room 805-808, New T Castle B/D, 429-1
+                               Gasan-Dong, Geumchen-Gu
+                               Seoul 153-803
+                               KOREA, REPUBLIC OF
+
   60-0F-77   (hex)             SilverPlus, Inc
   600F77     (base 16)         SilverPlus, Inc
                                18 Technology Dr, #143
@@ -98246,6 +98345,12 @@
                                Wuhan Hubei 430040
                                CHINA
 
+  68-36-B5   (hex)             DriveScale, Inc.
+  6836B5     (base 16)         DriveScale, Inc.
+                               530 Lakeside Dr. #190
+                               Sunnyvale CALIFORNIA 94085
+                               UNITED STATES
+
   68-3B-1E   (hex)             Countwise LTD
   683B1E     (base 16)         Countwise LTD
                                1149 Sawgrass Corporate Parkway
@@ -98802,6 +98907,12 @@
                                London  NW11 7PT
                                UNITED KINGDOM
 
+  6C-0B-84   (hex)             Universal Global Scientific Industrial Co.,Ltd.
+  6C0B84     (base 16)         Universal Global Scientific Industrial Co.,Ltd.
+                               141, Lane 351, TaiPing Road, Sec.1
+                               Tsao-Tuen  Nan-Tou 54261
+                               TAIWAN, PROVINCE OF CHINA
+
   6C-0E-0D   (hex)             Sony Ericsson Mobile Communications AB
   6C0E0D     (base 16)         Sony Ericsson Mobile Communications AB
                                Nya Vattentornet
@@ -100184,6 +100295,12 @@
                                Hangzhou Zhejiang, P.R.China 310053
                                CHINA
 
+  70-FC-8C   (hex)             OneAccess SA
+  70FC8C     (base 16)         OneAccess SA
+                               381 avenue du général de Gaulle
+                               CLAMART  France 92140
+                               FRANCE
+
   70-FF-5C   (hex)             Cheerzing Communication(Xiamen)Technology Co.,Ltd
   70FF5C     (base 16)         Cheerzing Communication(Xiamen)Technology Co.,Ltd
                                Room N514,North Torch Building,5 Torch Road
@@ -102538,6 +102655,13 @@
                                Kulim Kedah 09000
                                MALAYSIA
 
+  80-19-67   (hex)             Shanghai Reallytek Information Technology  Co.,Ltd
+  801967     (base 16)         Shanghai Reallytek Information Technology  Co.,Ltd
+                               906 Room,No.1 Building,No.3000 Longdong Avenue
+                               Pudong
+                               Shanghai 201203
+                               CHINA
+
   80-1D-AA   (hex)             Avaya Inc
   801DAA     (base 16)         Avaya Inc
                                211 Mount Airy Road
@@ -102594,6 +102718,12 @@
                                Sheung Shui, N. T.  
                                HONG KONG
 
+  80-37-73   (hex)             Netgear Inc
+  803773     (base 16)         Netgear Inc
+                               350 East Plumeria Drive
+                               San Jose CA 95134
+                               UNITED STATES
+
   80-38-FD   (hex)             LeapFrog Enterprises, Inc.
   8038FD     (base 16)         LeapFrog Enterprises, Inc.
                                6401 Holis Street
@@ -103712,9 +103842,9 @@
 
   84-E6-29   (hex)             Bluwan SA
   84E629     (base 16)         Bluwan SA
-                               Espace Lumiere, Bat 2
-                               4, rue Emile Pathe
-                               Chatou  78400
+                               Parc Les Grillons, Bat 1
+                               60 route de Sartrouville
+                               Le Pecq  78230
                                FRANCE
 
   84-E7-14   (hex)             Liang Herng Enterprise,Co.Ltd.
@@ -105102,6 +105232,13 @@
                                BXL Molenbeek 1080
                                BELGIUM
 
+  90-17-AC   (hex)             HUAWEI TECHNOLOGIES CO.,LTD
+  9017AC     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
+                               D1,Huawei Industrial Base
+                               Bantian, Longang
+                               Shenzhen Guangdong 518129
+                               CHINA
+
   90-18-5E   (hex)             Apex Tool Group GmbH & Co OHG
   90185E     (base 16)         Apex Tool Group GmbH & Co OHG
                                Industriestraße 1
@@ -105191,6 +105328,13 @@
                                Pin-Jen Taoyuan 324
                                TAIWAN, PROVINCE OF CHINA
 
+  90-2C-C7   (hex)             C-MAX Asia Limited
+  902CC7     (base 16)         C-MAX Asia Limited
+                               Unit 117, 1/F, Liven House
+                               61-63 King Yip Street
+                               Kwun Tong Kowloon 852
+                               HONG KONG
+
   90-2E-87   (hex)             LabJack
   902E87     (base 16)         LabJack
                                3232 S Vance St STE 100
@@ -106055,6 +106199,13 @@
                                Gumi Gyeongbuk 730-350
                                KOREA, REPUBLIC OF
 
+  94-70-D2   (hex)             WINFIRM TECHNOLOGY
+  9470D2     (base 16)         WINFIRM TECHNOLOGY
+                               2-1015 Lotte IT Castle
+                               550-1 Gasan-dong, Geumcheon-gu
+                               Seoul 153-768
+                               KOREA, REPUBLIC OF
+
   94-71-AC   (hex)             TCT Mobile Limited
   9471AC     (base 16)         TCT Mobile Limited
                                5F, E building, No. 232, Liang Jing Road ZhangJiang High-Tech Park, Pudong Area
@@ -106246,6 +106397,12 @@
                                PL9482565081 Mazowieckie 26-600
                                POLAND
 
+  94-C0-38   (hex)             Tallac Networks
+  94C038     (base 16)         Tallac Networks
+                               6528 Lonetree Blvd.
+                               Rocklin CA 95765
+                               UNITED STATES
+
   94-C1-50   (hex)             2Wire Inc
   94C150     (base 16)         2Wire Inc
                                1764 Automation Parkway
@@ -108571,6 +108728,12 @@
                                Lund Skåne 22643
                                SWEDEN
 
+  A4-25-1B   (hex)             Avaya, Inc
+  A4251B     (base 16)         Avaya, Inc
+                               211 Mount Airy Road
+                               Basking Ridge NJ 07920-2311
+                               UNITED STATES
+
   A4-29-40   (hex)             Shenzhen YOUHUA Technology Co., Ltd
   A42940     (base 16)         Shenzhen YOUHUA Technology Co., Ltd
                                Shenzhen University-town Business Park,Lishan Road,Taoyuan Street
@@ -108635,6 +108798,13 @@
                                Irvine CA 92618
                                UNITED STATES
 
+  A4-4A-D3   (hex)             ST Electronics(Shanghai) Co.,Ltd
+  A44AD3     (base 16)         ST Electronics(Shanghai) Co.,Ltd
+                               Floors 1&3, No.6 Building, No.1151 Lianxi Road
+                               Pudong New Area
+                               Shanghai 201204
+                               CHINA
+
   A4-4B-15   (hex)             Sun Cupid Technology (HK) LTD
   A44B15     (base 16)         Sun Cupid Technology (HK) LTD
                                Room 1201-3, 12/F., Tower 6
@@ -108859,6 +109029,13 @@
                                Plymouth Michigan 48170
                                UNITED STATES
 
+  A4-9D-49   (hex)             Ketra, Inc.
+  A49D49     (base 16)         Ketra, Inc.
+                               3815 S. Capital of Texas Hwy
+                               Suite 100
+                               Austin TX 78704
+                               UNITED STATES
+
   A4-9E-DB   (hex)             AutoCrib, Inc.
   A49EDB     (base 16)         AutoCrib, Inc.
                                3011 S. Croddy Way
@@ -109625,6 +109802,13 @@
                                Dali City Taichung 412
                                TAIWAN, PROVINCE OF CHINA
 
+  A8-D0-E3   (hex)             Systech Electronics Ltd.
+  A8D0E3     (base 16)         Systech Electronics Ltd.
+                               Lever Tech Centre, 69-71 King Yip Street,
+                               Kwun Tong, Kowloon, Hong Kong
+                               852
+                               HONG KONG
+
   A8-D0-E5   (hex)             Juniper Networks
   A8D0E5     (base 16)         Juniper Networks
                                1194 N Mathilda Avenue
@@ -111311,6 +111495,13 @@
                                Raleigh NC 27609
                                UNITED STATES
 
+  B4-39-34   (hex)             Pen Generations, Inc.
+  B43934     (base 16)         Pen Generations, Inc.
+                               8th FL., SOLiD Space,
+                               673 Sampyeong-dong, Bundang-gu
+                               Seongnam-si Gyeonggi-do 463-400
+                               KOREA, REPUBLIC OF
+
   B4-39-D6   (hex)             ProCurve Networking by HP
   B439D6     (base 16)         ProCurve Networking by HP
                                800 Foothills Blvd.
@@ -112298,6 +112489,12 @@
                                KYOTO KYOTO 601-8501
                                JAPAN
 
+  B8-AE-ED   (hex)             Elitegroup Computer Systems Co., Ltd.
+  B8AEED     (base 16)         Elitegroup Computer Systems Co., Ltd.
+                               No. 239, Sec. 2, Ti Ding Blvd.,
+                               Taipei 11493
+                               TAIWAN, PROVINCE OF CHINA
+
   B8-AF-67   (hex)             Hewlett-Packard Company
   B8AF67     (base 16)         Hewlett-Packard Company
                                11445 Compaq Center Drive
@@ -112652,6 +112849,13 @@
                                San Jose CA 95134
                                UNITED STATES
 
+  BC-16-F5   (hex)             Cisco
+  BC16F5     (base 16)         Cisco
+                               170 West Tasman Drive
+                               SJCM/2
+                               San Jose CA 95134
+                               UNITED STATES
+
   BC-1A-67   (hex)             YF Technology Co., Ltd
   BC1A67     (base 16)         YF Technology Co., Ltd
                                No.62,South Fumin Road,
@@ -113191,6 +113395,12 @@
                                Amerang Bavaria 83123
                                GERMANY
 
+  BC-EA-FA   (hex)             Hewlett Packard
+  BCEAFA     (base 16)         Hewlett Packard
+                               11445 Compaq Center Drive
+                               Houston Texas 77070
+                               UNITED STATES
+
   BC-EE-7B   (hex)             ASUSTek COMPUTER INC.
   BCEE7B     (base 16)         ASUSTek COMPUTER INC.
                                15,Li-Te Rd., Peitou
@@ -113337,6 +113547,13 @@
                                SOEBORG  2860
                                DENMARK
 
+  C0-38-96   (hex)             Hon Hai Precision Ind. Co.,Ltd.
+  C03896     (base 16)         Hon Hai Precision Ind. Co.,Ltd.
+                               Building D21,No.1, East Zone 1st Road,
+                               Xiyong Town,Shapingba District
+                               Chongqing 401332
+                               CHINA
+
   C0-38-F9   (hex)             Nokia Danmark A/S
   C038F9     (base 16)         Nokia Danmark A/S
                                Frederikskaj
@@ -113573,6 +113790,13 @@
                                Roseville California 95747
                                UNITED STATES
 
+  C0-98-79   (hex)             Acer Inc.
+  C09879     (base 16)         Acer Inc.
+                               8F, 88, Sec.1, Xintai 5th Rd.
+                               Xizhi
+                               New Taipei City  221
+                               TAIWAN, PROVINCE OF CHINA
+
   C0-98-E5   (hex)             University of Michigan
   C098E5     (base 16)         University of Michigan
                                4808 Beyster Bldg,
@@ -113870,6 +114094,13 @@
                                Ottawa ON K2K 2E6
                                CANADA
 
+  C4-08-80   (hex)             Shenzhen UTEPO Tech Co., Ltd.
+  C40880     (base 16)         Shenzhen UTEPO Tech Co., Ltd.
+                               5/F Western Block, M-8 Building,
+                               Mid-section of Hi-tech industrial park, nanshan district
+                               Shenzhen Guangdong 518057
+                               CHINA
+
   C4-09-38   (hex)             Fujian Star-net Communication Co., Ltd
   C40938     (base 16)         Fujian Star-net Communication Co., Ltd
                                19-22# Building,Star-net Science Plaza,Juyuanzhou, 618 Jinshan Road
@@ -117058,6 +117289,12 @@
                                SAN JOSE CA 95134-1706
                                UNITED STATES
 
+  D4-8D-D9   (hex)             Meld Technology, Inc
+  D48DD9     (base 16)         Meld Technology, Inc
+                               725 San Aleso Ave
+                               Sunnyvale CA 94085
+                               UNITED STATES
+
   D4-8F-33   (hex)             Microsoft Corporation
   D48F33     (base 16)         Microsoft Corporation
                                1 Microsoft Way
@@ -117761,6 +117998,13 @@
                                Santa Barbara California 93101
                                UNITED STATES
 
+  D8-80-39   (hex)             Microchip Technology Inc.
+  D88039     (base 16)         Microchip Technology Inc.
+                               2355 W. Chandler Blvd.
+                               M/S 4-2-A
+                               Chandler AZ 85224
+                               UNITED STATES
+
   D8-81-CE   (hex)             AHN INC.
   D881CE     (base 16)         AHN INC.
                                1006,Halla sigma valley, 53, Gasandigital 2-Ro
@@ -118540,6 +118784,13 @@
                                Warminster Wiltshire BA12 6DG
                                UNITED KINGDOM
 
+  DC-C6-22   (hex)             BUHEUNG SYSTEM
+  DCC622     (base 16)         BUHEUNG SYSTEM
+                               302, 45, Jeonpa-ro, 24 Beongil
+                               Manan-gu
+                               Anyang-si Gyeonggi-do 430-857
+                               KOREA, REPUBLIC OF
+
   DC-C7-93   (hex)             Nokia Corporation
   DCC793     (base 16)         Nokia Corporation
                                Joensuunkatu 7
@@ -119451,6 +119702,13 @@
                                Research Triangle Park NC 27709-2195
                                UNITED STATES
 
+  E4-23-54   (hex)             SHENZHEN FUZHI SOFTWARE TECHNOLOGY CO.,LTD
+  E42354     (base 16)         SHENZHEN FUZHI SOFTWARE TECHNOLOGY CO.,LTD
+                               4/F,Fuxing Bldg,Binlang Road,
+                               Futian Free Trade Zone
+                               SHENZHEN Guang Dong 518038
+                               CHINA
+
   E4-25-E7   (hex)             Apple
   E425E7     (base 16)         Apple
                                1 Infinite Loop
@@ -119721,6 +119979,12 @@
                                Cupertino CA 95014
                                UNITED STATES
 
+  E4-8C-0F   (hex)             Discovery Insure
+  E48C0F     (base 16)         Discovery Insure
+                               3 Alice lane
+                               Sandton Gauteng 2196
+                               SOUTH AFRICA
+
   E4-90-69   (hex)             Rockwell Automation
   E49069     (base 16)         Rockwell Automation
                                1 Allen-Bradley Dr.
@@ -120044,6 +120308,13 @@
                                Shinjuku-ku Tokyo 169-8333
                                JAPAN
 
+  E8-18-63   (hex)             IEEE REGISTRATION AUTHORITY  - Please see MAM public listing for more information.
+  E81863     (base 16)         IEEE REGISTRATION AUTHORITY  - Please see MAM public listing for more information.
+                               
+                               445 HOES LANE
+                               PISCATAWAY NJ 08854
+                               UNITED STATES
+
   E8-28-77   (hex)             TMY Co., Ltd.
   E82877     (base 16)         TMY Co., Ltd.
                                Attic Bldg. 3F, 1-2-10 Ise-cho,
@@ -123635,6 +123906,13 @@
                                Yogyakarta DIY 55281
                                INDONESIA
 
+  FC-5B-39   (hex)             Cisco
+  FC5B39     (base 16)         Cisco
+                               170 West Tasman Drive
+                               SJCM/2
+                               San Jose CA 95134
+                               UNITED STATES
+
   FC-60-18   (hex)             Zhejiang Kangtai Electric Co., Ltd.
   FC6018     (base 16)         Zhejiang Kangtai Electric Co., Ltd.
                                No.5, Kangtai Rd

diff --git a/udev-hwdb-update.pl b/udev-hwdb-update.pl
index 68c63ede4383f82e14838cbd78cc4032b0264319..86d414a6ffecf835ed63280684d26bca4d896b67 100644 (file)
--- a/udev-hwdb-update.pl
+++ b/udev-hwdb-update.pl
@@ -144,7 +144,7 @@ sub pci_vendor {
                         my $sub_device = uc $2;
                         my $sub_text = $3;
                         $sub_text =~ s/^\Q$device_text\E\s*//;
-                        $sub_text =~ s/(.+)/\ (\1\)/;
+                        $sub_text =~ s/(.+)/\ ($1)/;
                         print(OUT "\n");
                         print(OUT "pci:v0000" . $vendor . "d0000" . $device . "sv0000" . $sub_vendor . "sd0000" . $sub_device . "*\n");
                         print(OUT " ID_MODEL_FROM_DATABASE=" . $device_text . $sub_text . "\n");

diff --git a/udev/60-keyboard.hwdb b/udev/60-keyboard.hwdb
index c7ff4e4d23cd68d8892ae0ea0b17880f0b454df5..cbbbf2caaeb8affdf57af2fbfddd9c245d0bdaa8 100644 (file)
--- a/udev/60-keyboard.hwdb
+++ b/udev/60-keyboard.hwdb
@@ -229,6 +229,10 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnPrecision*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS*:pvr*
  KEYBOARD_KEY_8c=!unknown
 
+# Dell Latitude microphone mute
+keyboard:name:Dell WMI hotkeys:dmi:bvn*:bvr*:bd*:svnDell*:pnLatitude*
+ KEYBOARD_KEY_150=f20                                   # Mic mute toggle, should be micmute
+
 ###########################################################
 # Everex
 ###########################################################
@@ -501,7 +505,7 @@ keyboard:name:ThinkPad Extra Buttons:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*
  KEYBOARD_KEY_15=volumedown
  KEYBOARD_KEY_16=mute
  KEYBOARD_KEY_17=prog1
- KEYBOARD_KEY_1a=f20
+ KEYBOARD_KEY_1a=f20                                    # Microphone mute button; should be micmute
 
 # ThinkPad Keyboard with TrackPoint
 keyboard:usb:v17EFp6009*
@@ -569,7 +573,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad*Y550*:pvr*
 
 keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad*U300s*:pvr*
  KEYBOARD_KEY_f1=f21
- KEYBOARD_KEY_ce=f20
+ KEYBOARD_KEY_ce=f20                                    # micmute
 
 keyboard:dmi:bvn*:bvr*:svnLENOVO*:pn*IdeaPad*Z370*:pvr*
  KEYBOARD_KEY_a0=!mute
@@ -805,7 +809,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnOLPC:pnXO:*
  KEYBOARD_KEY_f3=f17
  KEYBOARD_KEY_f2=f18
  KEYBOARD_KEY_f1=f19
- KEYBOARD_KEY_f0=f20
+ KEYBOARD_KEY_f0=f20                                    # micmute
  KEYBOARD_KEY_ef=f21
  KEYBOARD_KEY_ee=chat
  KEYBOARD_KEY_e4=chat