Update.

diff --git a/oui.txt b/oui.txt
index c890e656db1b7d200cab8762b8ccb496e1f1be27..4d6666a7c0e738afa5aec63d46f7c8f8b998feeb 100644 (file)
--- a/oui.txt
+++ b/oui.txt
@@ -46102,11 +46102,11 @@
                                Oregon City Oregon 97045
                                UNITED STATES
 
-  00-1C-75   (hex)             RF Systems GmbH
-  001C75     (base 16)         RF Systems GmbH
-                               Einsteinstraße 11
-                               Viernheim Hessen D 68519
-                               GERMANY
+  00-1C-75   (hex)             Segnet Ltd.
+  001C75     (base 16)         Segnet Ltd.
+                               146 New London Road
+                               Chelmsford Essex CM2 OAW  
+                               UNITED KINGDOM
 
   00-1C-76   (hex)             The Wandsworth Group Ltd
   001C76     (base 16)         The Wandsworth Group Ltd
@@ -69916,6 +69916,12 @@
                                Gumi Gyeongbuk 730-350
                                KOREA, REPUBLIC OF
 
+  00-75-32   (hex)             INID BV
+  007532     (base 16)         INID BV
+                               Mariettahof 27
+                               Haarlem NH 2033WS
+                               NETHERLANDS
+
   00-75-E1   (hex)             Ampt, LLC
   0075E1     (base 16)         Ampt, LLC
                                4850 Innovation Drive
@@ -80972,6 +80978,13 @@
                                Boulder CO 80301-2350
                                UNITED STATES
 
+  04-E6-76   (hex)             AMPAK Technology Inc.
+  04E676     (base 16)         AMPAK Technology Inc.
+                               No.1,Jen Ai Road
+                               Hsinchu Industrail Park,Hukou
+                               Hsinchu  30352
+                               TAIWAN, PROVINCE OF CHINA
+
   04-E9-E5   (hex)             PJRC.COM, LLC
   04E9E5     (base 16)         PJRC.COM, LLC
                                14723 SW Brooke Ct
@@ -82519,6 +82532,12 @@
                                Baoan District Shenzhen Guangdong 518109
                                CHINA
 
+  08-DF-1F   (hex)             Bose Corporation
+  08DF1F     (base 16)         Bose Corporation
+                               The Mountain
+                               Framingham MA 01701-9168
+                               UNITED STATES
+
   08-E5-DA   (hex)             NANJING FUJITSU COMPUTER PRODUCTS CO.,LTD.
   08E5DA     (base 16)         NANJING FUJITSU COMPUTER PRODUCTS CO.,LTD.
                                NO.1,XIANXIN MID-ROAD
@@ -87040,6 +87059,12 @@
                                ShenZhen GuangDong 518129
                                CHINA
 
+  28-32-C5   (hex)             Humax.co.,ltd
+  2832C5     (base 16)         Humax.co.,ltd
+                               HUMAX Village,216,Hwangsaeul-ro,Bundang-gu
+                               Seongnam-si Gyeonggi-do 463-875
+                               KOREA, REPUBLIC OF
+
   28-34-10   (hex)             Enigma Diagnostics Limited
   283410     (base 16)         Enigma Diagnostics Limited
                                Building 224
@@ -87229,6 +87254,12 @@
                                Shenzhen Guangdong 518057
                                CHINA
 
+  28-80-23   (hex)             Hewlett Packard
+  288023     (base 16)         Hewlett Packard
+                               11445 Compaq Center Drive
+                               Houston Texas 77070
+                               UNITED STATES
+
   28-85-2D   (hex)             Touch Networks
   28852D     (base 16)         Touch Networks
                                2515 152nd Ave NE
@@ -87958,6 +87989,12 @@
                                Shanghai  201613
                                CHINA
 
+  2C-8A-72   (hex)             HTC Corporation
+  2C8A72     (base 16)         HTC Corporation
+                               No. 23, Xinghua Rd., Taoyuan City
+                               Taoyuan County Taiwan 330
+                               TAIWAN, PROVINCE OF CHINA
+
   2C-8B-F2   (hex)             Hitachi Metals America Ltd
   2C8BF2     (base 16)         Hitachi Metals America Ltd
                                1920 Zanker Road
@@ -88625,6 +88662,12 @@
                                SUWON- SI GYEONGGI 443-742
                                KOREA, REPUBLIC OF
 
+  30-D1-7E   (hex)             HUAWEI TECHNOLOGIES CO.,LTD
+  30D17E     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
+                               D1,Huawei Industrial Base,Bantian,Longgang,Shenzhen
+                               ShenZhen GuangDong 518129
+                               CHINA
+
   30-D3-57   (hex)             Logosol, Inc.
   30D357     (base 16)         Logosol, Inc.
                                5041 ROBERT J. MATHEWS PARKWAY
@@ -89725,6 +89768,12 @@
                                Woburn MA 01801
                                UNITED STATES
 
+  38-BB-3C   (hex)             Avaya, Inc
+  38BB3C     (base 16)         Avaya, Inc
+                               211 Mount Airy Rolad
+                               Basking Ridge NJ 07920-2311
+                               UNITED STATES
+
   38-BC-1A   (hex)             Meizu technology co.,ltd
   38BC1A     (base 16)         Meizu technology co.,ltd
                                Meizu Tech Bldg.,
@@ -90528,6 +90577,12 @@
                                Shenzhen Guangdong 518055
                                CHINA
 
+  3C-F8-08   (hex)             HUAWEI TECHNOLOGIES CO.,LTD
+  3CF808     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
+                               D1,Huawei Industrial Base,Bantian,Longgang,Shenzhen
+                               ShenZhen GuangDong 518129
+                               CHINA
+
   3C-FB-96   (hex)             Emcraft Systems LLC
   3CFB96     (base 16)         Emcraft Systems LLC
                                2191 S. El Camino Real
@@ -91866,6 +91921,12 @@
                                Shanghai 200433
                                CHINA
 
+  48-1A-84   (hex)             Pointer Telocation Ltd
+  481A84     (base 16)         Pointer Telocation Ltd
+                               14 Hamelacha Street,
+                               Rosh Ha’ayin Israel 48091
+                               ISRAEL
+
   48-1B-D2   (hex)             Intron Scientific co., ltd.
   481BD2     (base 16)         Intron Scientific co., ltd.
                                6F., NO. 136,Sec 2,Keelung Rd., Da-an district
@@ -92437,6 +92498,12 @@
                                Mount Kuring-Gai New South Wales 2080
                                AUSTRALIA
 
+  4C-39-09   (hex)             HPL Electric & Power Private Limited
+  4C3909     (base 16)         HPL Electric & Power Private Limited
+                               133, Pace City-1, Sec-37
+                               Gurgaon Haryana 122001
+                               INDIA
+
   4C-39-10   (hex)             Newtek Electronics co., Ltd.
   4C3910     (base 16)         Newtek Electronics co., Ltd.
                                Byucksan-Sunyoung Technopia 1004,
@@ -93573,6 +93640,12 @@
                                Louisville Kentucky 40207
                                UNITED STATES
 
+  54-2A-A2   (hex)             Alpha Networks Inc.
+  542AA2     (base 16)         Alpha Networks Inc.
+                               No.8 Li-shing 7th Rd., Science-based Industrial Park
+                               Hsinchu Taiwan 300
+                               TAIWAN, PROVINCE OF CHINA
+
   54-2C-EA   (hex)             PROTECTRON
   542CEA     (base 16)         PROTECTRON
                                140 zone industriel
@@ -103338,6 +103411,12 @@
                                Seattle WA 98195
                                UNITED STATES
 
+  90-7E-BA   (hex)             UTEK TECHNOLOGY (SHENZHEN) CO.,LTD
+  907EBA     (base 16)         UTEK TECHNOLOGY (SHENZHEN) CO.,LTD
+                               6F, C Building JiaAn Industrial Zone, 72# district of Baoan, ShenZhen, China
+                               SHENZHEN Guangdong Province 518101
+                               CHINA
+
   90-7F-61   (hex)             Chicony Electronics Co., Ltd.
   907F61     (base 16)         Chicony Electronics Co., Ltd.
                                No.25, Wu-Gong 6th Rd., Wu Ku Industrial Park,
@@ -105486,6 +105565,12 @@
                                Shinjuku-ku Tokyo 160-0021
                                JAPAN
 
+  A0-02-DC   (hex)             Amazon Technologies Inc.
+  A002DC     (base 16)         Amazon Technologies Inc.
+                               P.O Box 8102
+                               Reno NV 89507
+                               UNITED STATES
+
   A0-03-63   (hex)             Robert Bosch Healthcare GmbH
   A00363     (base 16)         Robert Bosch Healthcare GmbH
                                Stuttgarter Stra
@@ -106324,6 +106409,13 @@
                                PISCATAWAY NJ 08854
                                UNITED STATES
 
+  A4-3D-78   (hex)             GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+  A43D78     (base 16)         GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+                               NO.18 HAIBIN ROAD,
+                               WUSHA,CHANG'AN
+                               DONG GUAN GUANG DONG 523860
+                               CHINA
+
   A4-46-6B   (hex)             EOC Technology
   A4466B     (base 16)         EOC Technology
                                #1601 Acro Palace, 1594 Gwanyang-dong, Dongan-gu
@@ -109226,6 +109318,12 @@
                                Hayward CA 94544
                                UNITED STATES
 
+  B4-EE-B4   (hex)             ASKEY COMPUTER CORP
+  B4EEB4     (base 16)         ASKEY COMPUTER CORP
+                               10F,NO.119,CHIENKANG RD,ZHONGHE DIST NEW TAIPEI CITY
+                               TAIWAN TAIPEI 23585
+                               TAIWAN, PROVINCE OF CHINA
+
   B4-EE-D4   (hex)             Texas Instruments
   B4EED4     (base 16)         Texas Instruments
                                12500 TI Boulevard
@@ -114166,6 +114264,13 @@
                                Sheung Gyeonggi 429-809
                                KOREA, REPUBLIC OF
 
+  D4-97-0B   (hex)             XIAOMI CORPORATION
+  D4970B     (base 16)         XIAOMI CORPORATION
+                               The Rainbow City of China Resources
+                               NO 68,Qinghe Middle Street,
+                               Haidian District Beijing 100085
+                               CHINA
+
   D4-9A-20   (hex)             Apple
   D49A20     (base 16)         Apple
                                1 Infinite Loop
@@ -115247,6 +115352,12 @@
                                Changsha Hunan 410007
                                CHINA
 
+  DC-38-E1   (hex)             Juniper networks
+  DC38E1     (base 16)         Juniper networks
+                               1194 N. Mathilda Avenue
+                               Sunnyvale CA 94089
+                               UNITED STATES
+
   DC-3A-5E   (hex)             Roku, Inc
   DC3A5E     (base 16)         Roku, Inc
                                12980 Saratoga Ave.
@@ -115317,6 +115428,12 @@
                                Villingen-Schwenningen  78048
                                GERMANY
 
+  DC-66-3A   (hex)             Apacer Technology Inc.
+  DC663A     (base 16)         Apacer Technology Inc.
+                               1F., No.32, Zhongcheng Rd., Tucheng Dist.,
+                               New Taipei City Taiwan R.O.C. 236
+                               TAIWAN, PROVINCE OF CHINA
+
   DC-6F-00   (hex)             Livescribe, Inc.
   DC6F00     (base 16)         Livescribe, Inc.
                                7677 Oakport Street, 12th floor
@@ -116297,6 +116414,12 @@
                                Houston Texas 77070
                                UNITED STATES
 
+  E4-12-18   (hex)             ShenZhen Rapoo Technology Co., Ltd.
+  E41218     (base 16)         ShenZhen Rapoo Technology Co., Ltd.
+                               22,Jinxiu Road East,Pingshan District,Shenzhen,China
+                               Shenzhen Guangdong 518122
+                               CHINA
+
   E4-12-1D   (hex)             Samsung Electronics Co.,Ltd
   E4121D     (base 16)         Samsung Electronics Co.,Ltd
                                Samsung Electronics
@@ -116764,6 +116887,12 @@
                                Shanghai 200092
                                CHINA
 
+  E4-F4-C6   (hex)             NETGEAR
+  E4F4C6     (base 16)         NETGEAR
+                               350 East Plumeria Drive
+                               San Jose California 95134
+                               UNITED STATES
+
   E4-F7-A1   (hex)             Datafox GmbH
   E4F7A1     (base 16)         Datafox GmbH
                                Dermbacher Str. 12 - 14
@@ -117401,6 +117530,12 @@
                                San Jose CA 95134
                                UNITED STATES
 
+  E8-EF-89   (hex)             OPMEX Tech.
+  E8EF89     (base 16)         OPMEX Tech.
+                               18F GDC Building, 9 Gaoxin Central Avenue 3rd, Nanshan District
+                               Shenzhen Guangdong 518000
+                               CHINA
+
   E8-F1-B0   (hex)             SAGEMCOM SAS
   E8F1B0     (base 16)         SAGEMCOM SAS
                                250 ROUTE DE L'EMPEREUR
@@ -118625,6 +118760,13 @@
                                Aachen NRW 52068
                                GERMANY
 
+  F4-06-A5   (hex)             Hangzhou Bianfeng Networking technology Co., Ltd.
+  F406A5     (base 16)         Hangzhou Bianfeng Networking technology Co., Ltd.
+                               BlockC，2F，Building B，Paradise Software Park
+                               No3 Xidoumen Road
+                               Hangzhou Zhejiang 310012
+                               CHINA
+
   F4-0B-93   (hex)             Research In Motion
   F40B93     (base 16)         Research In Motion
                                295 Phillip Street
@@ -119017,6 +119159,12 @@
                                Chengdu Chongqing 610000
                                CHINA
 
+  F4-C4-47   (hex)             Coagent International Enterprise Limited
+  F4C447     (base 16)         Coagent International Enterprise Limited
+                               FLAT/RM 2 6F CROWN TND BLDG 106 HOW MING ST KWUN TONG
+                               Hong Kong 528133
+                               CHINA
+
   F4-C6-D7   (hex)             blackned GmbH
   F4C6D7     (base 16)         blackned GmbH
                                Am Hartholz 21

diff --git a/pci.ids b/pci.ids
index 8b949fbcabfc7d73a518767587cf153d0aae3ce6..049aa8827456f35bfad9c49d8b8be46732a97903 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2014.02.22
-#      Date:    2014-02-22 03:15:01
+#      Version: 2014.02.27
+#      Date:    2014-02-27 03:15:02
 #
 #      Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #      PCI ID Project at http://pci-ids.ucw.cz/.
@@ -1984,7 +1984,7 @@
                1787 2317  Radeon HD 7990
                1787 3000  Tahiti XT2 [Radeon HD 7970 GHz Edition]
        6799  New Zealand [Radeon HD 7900 Series]
-       679a  Tahiti PRO [Radeon HD 7950]
+       679a  Tahiti PRO [Radeon HD 7950/8950 OEM / R9 280]
                1002 0b01  Radeon HD 8950 OEM
                1002 3000  Tahiti PRO2 [Radeon HD 7950 Boost]
                1462 3000  Radeon HD 8950 OEM
@@ -17642,6 +17642,10 @@
        00a0  FBC4G Capture 4x1Gb
        00a1  FBC4XG Capture 4x10Gb
        00a2  FBC8XG Capture 8x10Gb
+       00a3  FBC2XG Capture 2x10Gb
+       00a4  FBC4XGG3 Capture 4x10Gb
+       00a5  FBC2XLG Capture 2x40Gb
+       00a6  FBC1CG Capture 1x100Gb
 # Used on V120 VME Crate Controller
 1c32  Highland Technology, Inc.
 1c33  Daktronics, Inc
@@ -19747,8 +19751,10 @@
                108e 7b13  Dual 10GBASE-T LP
        1520  I350 Ethernet Controller Virtual Function
        1521  I350 Gigabit Network Connection
+               1028 0602  Gigabit 2P I350-t LOM
                1028 1f60  Intel GbE 4P I350crNDC
                1028 1f62  Intel GbE 2P I350crNDC
+               1028 ff9a  Gigabit 4P X710/I350 rNDC
                103c 17d1  Ethernet 1Gb 4-port 366FLR Adapter
                103c 2003  Ethernet 1Gb 2-port 367i Adapter
                103c 2226  Ethernet 1Gb 1-port 364i Adapter
@@ -19776,6 +19782,7 @@
                8086 00a3  Ethernet Server Adapter I350-F4
                8086 00a4  Ethernet Server Adapter I350-F2
        1523  I350 Gigabit Backplane Connection
+               1028 1f9b  Gigabit 4P I350 bNDC
                103c 1784  Ethernet 1Gb 2-port 361FLB Adapter
                103c 18d1  Ethernet 1Gb 2-port 361FLB Adapter
                103c 1989  Ethernet 1Gb 2-port 363i Adapter

diff --git a/udev/60-keyboard.hwdb b/udev/60-keyboard.hwdb
index edfa842d80fa0e2807019d817daa51879593446c..bd8fd1018cf8861df0c90a7884c1bcf43572cf3c 100644 (file)
--- a/udev/60-keyboard.hwdb
+++ b/udev/60-keyboard.hwdb
@@ -897,9 +897,10 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*550P*:pvr*
  KEYBOARD_KEY_a8=!                                      # Fn Lock - Function lock on
  KEYBOARD_KEY_a9=!                                      # Fn Lock - Function lock off
 
+# Series 7 / 9
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700Z*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700G*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*900X[34][CDG]*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*900X[34][CDEFG]*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*940X3G*:pvr*
  KEYBOARD_KEY_ce=!prog1                                 # Fn+F1 launch settings
  KEYBOARD_KEY_a0=!mute                                  # Fn+F6 mute
@@ -909,7 +910,6 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*940X3G*:pvr*
  KEYBOARD_KEY_96=!kbdillumup                            # Fn+F10 keyboard backlight up
  KEYBOARD_KEY_b3=!prog3                                 # Fn+F11 fan/cooling mode changer
 
-# Series 9
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*900X[34][AB]*:pvr*
  KEYBOARD_KEY_ce=!                                      # Fn+F8 keyboard backlight up
  KEYBOARD_KEY_8d=!                                      # Fn+F7 keyboard backlight down