Update.

diff --git a/iab.txt b/iab.txt
index a220aba4f7afba512bc37cccee47e95d756474a1..f6642c665d085d9271f92af1e77368e20eaead97 100644 (file)
--- a/iab.txt
+++ b/iab.txt
@@ -1,4 +1,4 @@
-  Generated: Fri, 01 Aug 2014 05:00:02 -0400
+  Generated: Wed, 06 Aug 2014 05:00:02 -0400
 
   OUI                          Organization
   IAB Range                            Organization

diff --git a/oui.txt b/oui.txt
index 89da6afbc998d7f7d277e945d4da4036c5bade22..2bbe50ef7ce172bdce34574d77aab6c5b76f67e0 100644 (file)
--- a/oui.txt
+++ b/oui.txt
@@ -1,4 +1,4 @@
-  Generated: Fri, 01 Aug 2014 05:00:02 -0400
+  Generated: Wed, 06 Aug 2014 05:00:02 -0400
 
   OUI/MA-L                     Organization
   company_id                   Organization
@@ -80357,6 +80357,12 @@
                                Vantaa  01610
                                FINLAND
 
+  00-F4-6F   (hex)             Samsung Elec Co.,Ltd
+  00F46F     (base 16)         Samsung Elec Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   00-F4-B9   (hex)             Apple
   00F4B9     (base 16)         Apple
                                1 Infinite Loop
@@ -82720,6 +82726,12 @@
                                 Shanghai  201613
                                CHINA
 
+  08-EE-8B   (hex)             Samsung Elec Co.,Ltd
+  08EE8B     (base 16)         Samsung Elec Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   08-EF-3B   (hex)             MCS Logic Inc.
   08EF3B     (base 16)         MCS Logic Inc.
                                6F. Samho Center B Bldg., 275-6,Yangjae-Dong, Secho-Ku,Seoul
@@ -83229,6 +83241,12 @@
                                JAIPUR RAJASTHAN 302022
                                INDIA
 
+  0C-B3-19   (hex)             Samsung Elec Co.,Ltd
+  0CB319     (base 16)         Samsung Elec Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   0C-B4-EF   (hex)             Digience Co.,Ltd.
   0CB4EF     (base 16)         Digience Co.,Ltd.
                                204 Building for Growth, Gumi Electronics&Information Technology Research Institute, 17 Cheomdangieop-1ro,
@@ -84220,6 +84238,13 @@
                                Oulu Ou 90230
                                FINLAND
 
+  10-FA-CE   (hex)             Reacheng Communication Technology Co.,Ltd
+  10FACE     (base 16)         Reacheng Communication Technology Co.,Ltd
+                               Building No.5-401,
+                                No.3000 Long Dong Avenue,
+                               Pu Dong New District, Shanghai 201203
+                               CHINA
+
   10-FB-F0   (hex)             KangSheng LTD.
   10FBF0     (base 16)         KangSheng LTD.
                                2F., No.11,
@@ -90551,6 +90576,12 @@
                                Tricht Gelderland 4196 HC
                                NETHERLANDS
 
+  38-94-96   (hex)             Samsung Elec Co.,Ltd
+  389496     (base 16)         Samsung Elec Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   38-95-92   (hex)             Beijing Tendyron Corporation
   389592     (base 16)         Beijing Tendyron Corporation
                                1810,Tower B,Jin-ma,Building,17 East Qing Hua Road
@@ -92521,6 +92552,12 @@
                                Taipei TaiWan 23585
                                TAIWAN, PROVINCE OF CHINA
 
+  44-6D-6C   (hex)             Samsung Elec Co.,Ltd
+  446D6C     (base 16)         Samsung Elec Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   44-70-0B   (hex)             IFFU
   44700B     (base 16)         IFFU
                                33, Annyeom-gil 112 beon-gil,jeongnam-myeon
@@ -94716,6 +94753,12 @@
                                Bun-Dang, Seong-Nam Gyung-Gi 463-816
                                KOREA, REPUBLIC OF
 
+  50-F4-3C   (hex)             Leeo Inc
+  50F43C     (base 16)         Leeo Inc
+                               989 Comercial St
+                               Palo Alto CA 94303
+                               UNITED STATES
+
   50-F5-20   (hex)             Samsung Electronics Co.,Ltd
   50F520     (base 16)         Samsung Electronics Co.,Ltd
                                #94-1, Imsoo-Dong
@@ -97971,6 +98014,12 @@
                                Waldbronn BW 76337
                                GERMANY
 
+  64-B2-1D   (hex)             Chengdu Phycom Tech Co., Ltd.
+  64B21D     (base 16)         Chengdu Phycom Tech Co., Ltd.
+                               No.216 beisen road
+                               Chengdu Sichuan 610000
+                               CHINA
+
   64-B3-10   (hex)             Samsung Electronics Co.,Ltd
   64B310     (base 16)         Samsung Electronics Co.,Ltd
                                #94-1, Imsoo-Dong
@@ -97995,6 +98044,12 @@
                                Santa Clara CA 95050
                                UNITED STATES
 
+  64-B8-53   (hex)             Samsung Elec Co.,Ltd
+  64B853     (base 16)         Samsung Elec Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   64-B9-E8   (hex)             Apple
   64B9E8     (base 16)         Apple
                                1 Infinite Loop
@@ -103486,6 +103541,12 @@
                                Gumi Gyeongbuk 730-350
                                KOREA, REPUBLIC OF
 
+  84-55-A5   (hex)             Samsung Elec Co.,Ltd
+  8455A5     (base 16)         Samsung Elec Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   84-56-9C   (hex)             Coho Data, Inc.,
   84569C     (base 16)         Coho Data, Inc.,
                                1230 Midas Way, Suite 110
@@ -108395,6 +108456,12 @@
                                Houston Texas 77070
                                UNITED STATES
 
+  A0-B4-A5   (hex)             Samsung Elec Co.,Ltd
+  A0B4A5     (base 16)         Samsung Elec Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   A0-B5-DA   (hex)             HongKong THTF Co., Ltd
   A0B5DA     (base 16)         HongKong THTF Co., Ltd
                                2F,Sector C of Tsinghua University Academy,
@@ -109613,6 +109680,12 @@
                                Oulu  90570
                                FINLAND
 
+  A8-7C-01   (hex)             Samsung Elec Co.,Ltd
+  A87C01     (base 16)         Samsung Elec Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   A8-7E-33   (hex)             Nokia Danmark A/S
   A87E33     (base 16)         Nokia Danmark A/S
                                Frederikskaj
@@ -110071,6 +110144,13 @@
                                Xiamen Fujian 361006
                                CHINA
 
+  AC-3A-7A   (hex)             Roku
+  AC3A7A     (base 16)         Roku
+                               12980 Saratoga Ave
+                               Suite D
+                               Saratoga California 95070
+                               UNITED STATES
+
   AC-3C-0B   (hex)             Apple
   AC3C0B     (base 16)         Apple
                                1 Infinite Loop
@@ -118207,6 +118287,13 @@
                                SHATIN NT  
                                HONG KONG
 
+  D8-CB-8A   (hex)             Micro-Star INTL CO., LTD.
+  D8CB8A     (base 16)         Micro-Star INTL CO., LTD.
+                               No.69, Lide St.,
+                               Zhonghe Dist.,
+                               New Taipei City Taiwan 235
+                               TAIWAN, PROVINCE OF CHINA
+
   D8-CF-9C   (hex)             Apple
   D8CF9C     (base 16)         Apple
                                1 Infinite Loop
@@ -120194,6 +120281,12 @@
                                Geisa Thüringen 36419
                                GERMANY
 
+  E4-F8-EF   (hex)             Samsung Elec Co.,Ltd
+  E4F8EF     (base 16)         Samsung Elec Co.,Ltd
+                               #94-1, Imsoo-Dong
+                               Gumi Gyeongbuk 730-350
+                               KOREA, REPUBLIC OF
+
   E4-FA-1D   (hex)             PAD Peripheral Advanced Design Inc.
   E4FA1D     (base 16)         PAD Peripheral Advanced Design Inc.
                                1400 Hocquart
@@ -120560,6 +120653,12 @@
                                Suzhou Jiangsu 215021
                                CHINA
 
+  E8-87-A3   (hex)             Loxley Public Company Limited
+  E887A3     (base 16)         Loxley Public Company Limited
+                               102 Na Ranong Road, Klongtoey
+                               Bangkok 10110
+                               THAILAND
+
   E8-89-2C   (hex)             ARRIS Group, Inc.
   E8892C     (base 16)         ARRIS Group, Inc.
                                3871 Lakefield Drive

diff --git a/pci.ids b/pci.ids
index 213dc80044f2ea162c1fd3616a3d7f9722a3ffcb..59fad7a445e50aa764f80a57ef59cba027f5c876 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2014.06.27
-#      Date:    2014-06-27 03:15:01
+#      Version: 2014.08.06
+#      Date:    2014-08-06 03:15:01
 #
 #      Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #      PCI ID Project at http://pci-ids.ucw.cz/.
@@ -1033,7 +1033,7 @@
        4c54  264LT [Mach64 LT]
        4c57  RV200/M7 [Mobility Radeon 7500]
                1014 0517  ThinkPad T30
-               1014 0530  ThinkPad T42 2373-4WU
+               1014 0530  ThinkPad T4x Series
                1028 00e6  Radeon Mobility M7 LW (Dell Inspiron 8100)
                1028 012a  Latitude C640
                1043 1622  Mobility Radeon M7 (L3C/S)
@@ -2662,7 +2662,9 @@
                174b e180  Radeon HD 7350
                17af 3015  Radeon HD 7350
        68fe  Cedar LE
-       6900  Topaz XT [Radeon R7 M260]
+       6900  Topaz XT [Radeon R7 M260/M265]
+               1028 0640  Radeon R7 M265
+               1179 f934  Radeon R7 M260
        6901  Topaz PRO [Radeon R5 M255]
        6920  Tonga
        6921  Amethyst XT [Radeon R9 M295X]
@@ -3540,6 +3542,7 @@
                1014 04c7  PCIe3 x 8 Cache SAS RAID Internal Adapter 6GB(2CCA)
                1014 04c8  PCIe3 x 8 Cache SAS RAID Internal Adapter 6GB(2CD2)
                1014 0c49  PCIe3 x 8 Cache SAS RAID Internal Adapter 6GB(2CCD)
+       044b  GenWQE Accelerator Adapter
        04aa  Flash Adapter 90 (PCIe2 0.9TB)
        3022  QLA3022 Network Adapter
        4022  QLA3022 Network Adapter
@@ -8894,6 +8897,7 @@
        0fe1  GK107M [GeForce GT 730M]
        0fe2  GK107M [GeForce GT 745M]
        0fe3  GK107M [GeForce GT 745M]
+               103c 2b16  GeForce GT 745A
                17aa 3675  GeForce GT 745A
        0fe4  GK107M [GeForce GT 750M]
        0fe5  GK107 [GeForce K340 USM]
@@ -8906,6 +8910,7 @@
        0fef  GK107GL [GRID K340]
        0ff1  GK107 [NVS 1000]
        0ff2  GK107GL [GRID K1]
+       0ff3  GK107GL [Quadro K420]
        0ff5  GK107GL [GRID K1 Tesla USM]
        0ff6  GK107GLM [Quadro K1100M]
                103c 197b  ZBook 15
@@ -8955,6 +8960,7 @@
        1028  GK110GL [Tesla K20m]
        1029  GK110BGL [Tesla K40s]
        103a  GK110GL [Quadro K6000]
+       103c  GK110GL [Quadro K5200]
        1040  GF119 [GeForce GT 520]
        1042  GF119 [GeForce 510]
        1048  GF119 [GeForce 605]
@@ -9101,6 +9107,8 @@
                1028 05e8  GeForce GT 630M
                1028 05f4  GeForce GT 720M
                1028 064e  GeForce 820M
+               1028 0652  GeForce 820M
+               1028 0662  GeForce 820M
                1028 068d  GeForce 820M
                103c 18ef  GeForce GT 630M
                103c 18f9  GeForce GT 630M
@@ -9187,11 +9195,14 @@
                152d 0926  GeForce 620M
                152d 0982  GeForce GT 630M
                152d 0983  GeForce GT 630M
+               152d 1005  GeForce GT 820M
                152d 1012  GeForce 710M
+               152d 1019  GeForce 820M
                152d 1030  GeForce GT 630M
                152d 1055  GeForce 710M
                152d 1067  GeForce GT 720M
                152d 1072  GeForce GT 720M
+               152d 1086  GeForce 820M
                17aa 2200  NVS 5200M
                17aa 2213  GeForce GT 720M
                17aa 2220  GeForce GT 720M
@@ -9302,6 +9313,7 @@
                10de 101a  GRID K240Q
                10de 101b  GRID K260Q
        11b1  GK104GL [GRID K2 Tesla USM]
+       11b4  GK104GL [Quadro K4200]
        11b6  GK104GLM [Quadro K3100M]
        11b7  GK104GLM [Quadro K4100M]
        11b8  GK104GLM [Quadro K5100M]
@@ -9397,6 +9409,7 @@
                103c 2b0d  GeForce GT 710A
                103c 2b0f  GeForce GT 710A
                103c 2b11  GeForce GT 710A
+               103c 2b20  GeForce 810A
                103c 2b21  GeForce GT 810A
                103c 2b22  GeForce GT 810A
        1296  GK208M [GeForce 825M]
@@ -9405,6 +9418,7 @@
        12b9  GK208GLM [Quadro K610M]
        12ba  GK208GLM [Quadro K510M]
        1340  GM108M [GeForce 830M]
+               103c 2b2b  GeForce 830A
        1341  GM108M [GeForce 840M]
                17aa 3697  GeForce 840A
                17aa 3699  GeForce 840A
@@ -9418,6 +9432,9 @@
                17aa a125  GeForce GTX 850A
        1392  GM107M [GeForce GTX 860M]
        1393  GM107M [GeForce 840M]
+       13b3  GM107GLM [Quadro K2200M]
+       13ba  GM107GL [Quadro K2200]
+       13bb  GM107GL [Quadro K620]
 10df  Emulex Corporation
        0720  OneConnect NIC (Skyhawk)
                17aa 1056  ThinkServer OCm14102-UX-L AnyFabric
@@ -9877,6 +9894,7 @@
        0620  RocketRAID 620 2 Port SATA-III Controller
        0622  RocketRAID 622 2 Port SATA-III Controller
        0640  RocketRAID 640 4 Port SATA-III Controller
+       0644  RocketRAID 644 4 Port SATA-III Controller (eSATA)
        1720  RocketRAID 1720 (2x SATA II RAID Controller)
        1740  RocketRAID 1740
        1742  RocketRAID 1742
@@ -10930,8 +10948,9 @@
                13c2 1019  S2-3200
                13c2 1102  Technotrend/Hauppauge DVB card rev2.1
                153b 1155  Cinergy 1200 DVB-S
-               153b 1156  Terratec Cynergy 1200C
+               153b 1156  Cinergy 1200 DVB-C
                153b 1157  Cinergy 1200 DVB-T
+               153b 1176  Cinergy 1200 DVB-C (MK3)
                1894 0020  KNC One DVB-C V1.0
                1894 0023  TVStation DVB-C plus
        7160  SAA7160
@@ -13595,6 +13614,8 @@
        0204  GPS170PCI GPS Receiver
        0205  GPS170PEX GPS Receiver (PCI Express)
        0206  GPS180PEX GPS Receiver (PCI Express)
+       0207  GLN180PEX GPS/GLONASS receiver (PCI Express)
+       0208  GPS180AMC GPS Receiver (PCI Express / MicroTCA / AdvancedMC)
        0301  TCR510PCI IRIG Timecode Reader
        0302  TCR167PCI IRIG Timecode Reader
        0303  TCR511PCI IRIG Timecode Reader
@@ -13995,6 +14016,7 @@
                1043 838e  Virtuoso 66 (Xonar DS)
                1043 8428  Virtuoso 100 (Xonar Xense)
                1043 8467  CMI8786 (Xonar DG)
+               1043 85f4  Virtuoso 100 (Xonar Essence STX II)
                13f6 8782  PCI 2.0 HD Audio
                13f6 ffff  CMI8787-HG2PCI
                14c3 1710  HiFier Fantasia
@@ -14301,7 +14323,7 @@
        4081  T440F-4081 T440-FCoE Unified Wire Ethernet Controller
        4082  T420-4082  Unified Wire Ethernet Controller
        4083  T420X-4083 Unified Wire Ethernet Controller
-       4084  T420-4084 Unified Wire Ethernet Controller
+       4084  T440-4084 Unified Wire Ethernet Controller
        4085  T420-4085 SFP+ Unified Wire Ethernet Controller
        4086  T440-4086 10Gbase-T Unified Wire Ethernet Controller
        4087  T440T-4087 Unified Wire Ethernet Controller
@@ -14325,7 +14347,7 @@
        4481  T440F-4081 T440-FCoE Unified Wire Ethernet Controller
        4482  T420-4082  Unified Wire Ethernet Controller
        4483  T420X-4083 Unified Wire Ethernet Controller
-       4484  T420-4084 Unified Wire Ethernet Controller
+       4484  T440-4084 Unified Wire Ethernet Controller
        4485  T420-4085 SFP+ Unified Wire Ethernet Controller
        4486  T440-4086 10Gbase-T Unified Wire Ethernet Controller
        4487  T440T-4087 Unified Wire Ethernet Controller
@@ -14349,7 +14371,7 @@
        4581  T440F-4081 T440-FCoE Unified Wire Storage Controller
        4582  T420-4082  Unified Wire Storage Controller
        4583  T420X-4083 Unified Wire Storage Controller
-       4584  T420-4084 Unified Wire Storage Controller
+       4584  T440-4084 Unified Wire Storage Controller
        4585  T420-4085 SFP+ Unified Wire Storage Controller
        4586  T440-4086 10Gbase-T Unified Wire Storage Controller
        4587  T440T-4087 Unified Wire Storage Controller
@@ -14373,7 +14395,7 @@
        4681  T440F-4081 T440-FCoE Unified Wire Storage Controller
        4682  T420-4082  Unified Wire Storage Controller
        4683  T420X-4083 Unified Wire Storage Controller
-       4684  T420-4084 Unified Wire Storage Controller
+       4684  T440-4084 Unified Wire Storage Controller
        4685  T420-4085 SFP+ Unified Wire Storage Controller
        4686  T440-4086 10Gbase-T Unified Wire Storage Controller
        4687  T440T-4087 Unified Wire Storage Controller
@@ -14397,7 +14419,7 @@
        4781  T440F-4081 T440-FCoE Unified Wire Ethernet Controller
        4782  T420-4082  Unified Wire Ethernet Controller
        4783  T420X-4083 Unified Wire Ethernet Controller
-       4784  T420-4084 Unified Wire Ethernet Controller
+       4784  T440-4084 Unified Wire Ethernet Controller
        4785  T420-4085 SFP+ Unified Wire Ethernet Controller
        4786  T440-4086 10Gbase-T Unified Wire Ethernet Controller
        4787  T440T-4087 Unified Wire Ethernet Controller
@@ -14421,7 +14443,7 @@
        4881  T440F-4081 T440-FCoE Unified Wire Ethernet Controller [VF]
        4882  T420-4082 Unified Wire Ethernet Controller [VF]
        4883  T420X-4083 Unified Wire Ethernet Controller [VF]
-       4884  T420-4084 Unified Wire Ethernet Controller [VF]
+       4884  T440-4084 Unified Wire Ethernet Controller [VF]
        4885  T420-4085 SFP+ Unified Wire Ethernet Controller [VF]
        4886  T440-4086 10Gbase-T Unified Wire Ethernet Controller [VF]
        4887  T440T-4087 Unified Wire Ethernet Controller [VF]
@@ -14444,7 +14466,7 @@
        5010  T580-LP-CR Unified Wire Ethernet Controller
        5011  T520-LL-CR Unified Wire Ethernet Controller
        5012  T560-CR Unified Wire Ethernet Controller
-       5013  T580-CR Unified Wire Ethernet Controller
+       5013  T580-CHR Unified Wire Ethernet Controller
        5014  T580-LP-SO-CR Unified Wire Ethernet Controller
        5015  T502-BT Unified Wire Ethernet Controller
        5080  T540-5080 Unified Wire Ethernet Controller
@@ -14470,7 +14492,7 @@
        5410  T580-LP-CR Unified Wire Ethernet Controller
        5411  T520-LL-CR Unified Wire Ethernet Controller
        5412  T560-CR Unified Wire Ethernet Controller
-       5413  T580-CR Unified Wire Ethernet Controller
+       5413  T580-CHR Unified Wire Ethernet Controller
        5414  T580-LP-SO-CR Unified Wire Ethernet Controller
        5415  T502-BT Unified Wire Ethernet Controller
        5480  T540-5080 Unified Wire Ethernet Controller
@@ -14496,7 +14518,7 @@
        5510  T580-LP-CR Unified Wire Storage Controller
        5511  T520-LL-CR Unified Wire Storage Controller
        5512  T560-CR Unified Wire Storage Controller
-       5513  T580-CR Unified Wire Storage Controller
+       5513  T580-CHR Unified Wire Storage Controller
        5514  T580-LP-SO-CR Unified Wire Storage Controller
        5515  T502-BT Unified Wire Storage Controller
        5580  T540-5080 Unified Wire Storage Controller
@@ -14522,7 +14544,7 @@
        5610  T580-LP-CR Unified Wire Storage Controller
        5611  T520-LL-CR Unified Wire Storage Controller
        5612  T560-CR Unified Wire Storage Controller
-       5613  T580-CR Unified Wire Storage Controller
+       5613  T580-CHR Unified Wire Storage Controller
        5614  T580-LP-SO-CR Unified Wire Storage Controller
        5615  T502-BT Unified Wire Storage Controller
        5680  T540-5080 Unified Wire Storage Controller
@@ -14574,7 +14596,7 @@
        5810  T580-LP-CR Unified Wire Ethernet Controller [VF]
        5811  T520-LL-CR Unified Wire Ethernet Controller [VF]
        5812  T560-CR Unified Wire Ethernet Controller [VF]
-       5813  T580-CR Unified Wire Ethernet Controller [VF]
+       5813  T580-CHR Unified Wire Ethernet Controller [VF]
        5814  T580-LP-SO-CR Unified Wire Ethernet Controller [VF]
        5815  T502-BT Unified Wire Ethernet Controller [VF]
        5880  T540-5080 Unified Wire Ethernet Controller [VF]
@@ -15181,6 +15203,7 @@
        16a2  BCM57840 NetXtreme II 10/20-Gigabit Ethernet
                103c 1916  HP FlexFabric 20Gb 2-port 630FLB Adapter
                103c 1917  HP FlexFabric 20Gb 2-port 630M Adapter
+       16a3  NetXtreme BCM57786 Gigabit Ethernet PCIe
        16a4  BCM57840 NetXtreme II Ethernet Multi Function
                103c 1916  HP NPAR 20Gb 2-port 630FLB Adapter
                103c 1917  HP NPAR 20Gb 2-port 630M Adapter
@@ -15468,9 +15491,12 @@
        4359  BCM43228 802.11a/b/g/n
                1028 0011  Wireless 1530 Half-size Mini PCIe Card
                103c 182c  BCM943228HM4L 802.11a/b/g/n 2x2 Wi-Fi Adapter
+       4360  BCM4360 802.11ac Wireless Network Adapter
        4365  BCM43142 802.11b/g/n
                1028 0016  Wireless 1704 802.11n + BT 4.0
        43a0  BCM4360 802.11ac Wireless Network Adapter
+       43a9  BCM43217 802.11b/g/n
+       43aa  BCM43131 802.11b/g/n
        43b1  BCM4352 802.11ac Wireless Network Adapter
        4401  BCM4401 100Base-T
                1025 0035  TravelMate 660
@@ -16139,7 +16165,8 @@
        0740  Virtual Machine Communication Interface
        0770  USB2 EHCI Controller
        0774  USB1.1 UHCI Controller
-       0778  USB3 xHCI Controller
+       0778  USB3 xHCI 0.96 Controller
+       0779  USB3 xHCI 1.0 Controller
        0790  PCI bridge
        07a0  PCI Express Root Port
        07b0  VMXNET3 Ethernet Controller
@@ -16686,6 +16713,7 @@
 16b4  Aspex Semiconductor Ltd
 16b8  Sonnet Technologies, Inc.
 16be  Creatix Polymedia GmbH
+16c3  Synopsys, Inc.
 16c6  Micrel-Kendin
        8695  Centaur KS8695 ARM processor
        8842  KSZ8842-PMQL 2-Port Ethernet Switch
@@ -17721,6 +17749,7 @@
 1a22  Ambric Inc.
 1a29  Fortinet, Inc.
        4338  CP8 Content Processor ASIC
+       4e36  NP6 Network Processor
 1a2b  Ascom AG
        0000  GESP v1.2
        0001  GESP v1.3
@@ -17779,7 +17808,7 @@
 1a76  Wavesat
 1a77  Lightfleet Corporation
 1a78  Virident Systems Inc.
-       0031  Virident FlashMAX Drive
+       0031  FlashMAX Drive
                1a78 0034  FlashMAX PCIe SSD [rev 3]
                1a78 0037  FlashMAX PCIe SSD [rev 3D]
                1a78 0038  FlashMAX PCIe SSD [rev 4]
@@ -17787,6 +17816,7 @@
        0040  FlashMAX II
        0041  FlashMAX II
        0042  FlashMAX II
+       0050  FlashMAX III
 1a84  Commex Technologies
        0001  Vulcan SP HT6210 10-Gigabit Ethernet (rev 02)
 1a88  MEN Mikro Elektronik
@@ -20140,7 +20170,7 @@
                8086 011a  Ethernet Converged Network Adapter X520-4
                8086 011b  Ethernet Converged Network Adapter X520-4
                8086 011c  Ethernet Converged Network Adapter X520-4
-       154c  XL710 X710 Virtual Function
+       154c  XL710/X710 Virtual Function
        154d  Ethernet 10G 2P X520 Adapter
                8086 7b11  10GbE 2P X520 Adapter
        1557  82599 10 Gigabit Network Connection
@@ -20159,21 +20189,21 @@
        1560  Ethernet Controller X540
        156f  Ethernet Connection I219-LM
        1570  Ethernet Connection I219-V
-       1571  XL710 X710 Virtual Function
-       1572  Ethernet 10G 2P X710 Adapter
+       1571  XL710/X710 Virtual Function
+       1572  Ethernet Controller X710 for 10GbE SFP+
                1028 1f99  Ethernet 10G 4P X710/I350 rNDC
                8086 0000  Ethernet Converged Network Adapter X710
                8086 0001  Ethernet Converged Network Adapter X710-4
                8086 0002  Ethernet Converged Network Adapter X710-4
                8086 0004  Ethernet Converged Network Adapter X710-4
                8086 0005  Ethernet 10G 4P X710 Adapter
-               8086 0006  Ethernet 10G2P X710 Adapter
+               8086 0006  Ethernet 10G 2P X710 Adapter
                8086 0007  Ethernet Converged Network Adapter X710-2
                8086 0008  Ethernet Converged Network Adapter X710-2
        157b  I210 Gigabit Network Connection
        157c  I210 Gigabit Backplane Connection
-       1580  Ethernet Controller XL710 for 40Gbe backplane
-       1581  Ethernet Controller X710 for 10Gbe backplane
+       1580  Ethernet Controller XL710 for 40GbE backplane
+       1581  Ethernet Controller X710 for 10GbE backplane
                1028 1f98  Ethernet 10G 4P X710-k bNDC
        1583  Ethernet Controller XL710 for 40GbE QSFP+
                8086 0000  Ethernet Converged Network Adapter XL710-Q2
@@ -20972,7 +21002,7 @@
        24c5  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller
                0e11 00b8  Analog Devices Inc. codec [SoundMAX]
                1014 0267  NetVista A30p
-               1014 0537  ThinkPad T41
+               1014 0537  ThinkPad T4x Series
                1014 055f  Thinkpad R50e model 1634
                1025 005a  TravelMate 290
                1028 0139  Latitude D400
@@ -20996,7 +21026,7 @@
                1734 1055  Amilo M1420
                8086 24c5  Dell Dimension 2400
        24c6  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller
-               1014 0524  ThinkPad T41
+               1014 0524  ThinkPad T4x Series
                1014 0525  ThinkPad
                1014 0559  ThinkPad R50e
                1025 003c  Aspire 2001WLCi (Compal CL50 motherboard) implementation
@@ -24940,6 +24970,7 @@ d161  Digium, Inc.
        1220  Wildcard TE220 dual-span T1/E1/J1 card 3.3V (PCI-Express) (5th gen)
        1405  Wildcard TE405P/TE407P quad-span T1/E1/J1 card 5.0V (u1)
        1420  Wildcard TE420 quad-span T1/E1/J1 card 3.3V (PCI-Express) (5th gen)
+       1820  Wildcard TE820 octal-span T1/E1/J1 card 3.3V (PCI-Express)
        2400  Wildcard TDM2400P 24-port analog card
        3400  Wildcard TC400P transcoder base card
        8000  Wildcard TE121 single-span T1/E1/J1 card (PCI-Express)
@@ -24953,6 +24984,7 @@ d161  Digium, Inc.
        8008  Hx8 Series 8-port Base Card (PCI-Express)
        800a  Wildcard TE133 single-span T1/E1/J1 card (PCI Express)
        800b  Wildcard TE134 single-span T1/E1/J1 card
+       800e  Wildcard TE435P quad-span T1/E1/J1 card 3.3V (PCI-Express)
        b410  Wildcard B410 quad-BRI card
 d4d4  Dy4 Systems Inc
        0601  PCI Mezzanine Card

diff --git a/udev/60-keyboard.hwdb b/udev/60-keyboard.hwdb
index cbbbf2caaeb8affdf57af2fbfddd9c245d0bdaa8..5c3d4ca7e721bf252f06ca467c151e161ba65c6a 100644 (file)
--- a/udev/60-keyboard.hwdb
+++ b/udev/60-keyboard.hwdb
@@ -368,7 +368,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP*Pavilion*dv7*Notebook*PC:pvr
  KEYBOARD_KEY_b7=print
  KEYBOARD_KEY_c2=media                                  # FIXME: quick play
  KEYBOARD_KEY_c6=break
- KEYBOARD_KEY_94=0
+ KEYBOARD_KEY_94=reserved
 
 # Elitebook
 keyboard:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*Compaq*:pvr*

diff --git a/usb.ids b/usb.ids
index 9e75f7805dc8b77fc72f2f9e1f55985f98456208..5776202739f0767231ddc00aeb02a057f42bd3ff 100644 (file)
--- a/usb.ids
+++ b/usb.ids
@@ -9,8 +9,8 @@
 #      The latest version can be obtained from
 #              http://www.linux-usb.org/usb.ids
 #
-# Version: 2014.06.26
-# Date:    2014-06-26 20:34:04
+# Version: 2014.07.31
+# Date:    2014-07-31 11:38:05
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -194,6 +194,7 @@
        0314  designjet 30/130 series
        0317  LaserJet 1200
        0324  SK-2885 keyboard
+       034a  Elite Keyboard
        0401  ScanJet 5200c
        0404  DeskJet 830c/832c
        0405  ScanJet 3400cse
@@ -275,6 +276,7 @@
        1312  DeskJet 460
        1317  LaserJet 1005
        1327  iLO Virtual Hub
+       134a  Optical Mouse
        1405  ScanJet 3670
        1411  PSC 750
        1424  f2105 Monitor Hub
@@ -798,6 +800,8 @@
        ed74  HAMEG HO820 Serial Port
        ef10  FT1245BL
        f070  Serial Converter 422/485 [Vardaan VEUSB422R3]
+       f0c8  SPROG Decoder Programmer
+       f0c9  SPROG-DCC CAN-USB
        f0e9  Tagsys L-P101
        f1a0  Asix PRESTO Programmer
        f208  Papenmeier Braille-Display
@@ -900,6 +904,7 @@
        0249  Aterm WL300NU-G
        02b4  Aterm WL300NU-AG
        02b6  Aterm WL300NU-GS 802.11n Wireless Adapter
+       02bc  Computer Monitor
        0300  LifeTouch Note
        0301  LifeTouch Note (debug mode)
        55aa  Hub
@@ -1802,6 +1807,7 @@
        0021  HID Monitor Controls
        0050  Diamond Pro 900u CRT Monitor
        0051  Integrated Hub
+       0100  Control Panel for Leica TCS SP5
 0453  CMD Technology
        6781  NMB Keyboard
        6783  Chicony Composite Keyboard
@@ -2939,6 +2945,7 @@
        a007  External Disk USB 3.0
        a009  Stor.E Basics
        a00d  STOR.E BASICS 500GB
+       b001  Stor.E Partner
        d010  External Disk 3TB
 0481  Zenith Data Systems
 0482  Kyocera Corp.
@@ -3760,12 +3767,14 @@
        3260  PowerShot SX270 HS
        3261  PowerShot A3500 IS
        3262  PowerShot A2600
+       3263  PowerShot SX275 HS
        3264  PowerShot A1400
        3265  Powershot ELPH 130 IS / IXUS 140
        3268  PowerShot ELPH 330 HS / IXUS 255 HS
        3271  PowerShot A2500
        3276  PowerShot SX170 IS
        3277  PowerShot SX510 HS
+       3278  PowerShot S200
        327d  Powershot ELPH 115 IS / IXUS 132
        327f  EOS Rebel T5 / EOS 1200D / EOS Kiss X70
        3284  PowerShot D30
@@ -3901,6 +3910,7 @@
        1006  Human Interface Device
        2050  hub
        2830  Opera1 DVB-S (cold state)
+       3813  NANO BIOS Programmer
        4235  Monitor 02 Driver
        4381  SCAPS USC-1 Scanner Controller
        4611  Storage Adapter FX2 (CY)
@@ -4386,12 +4396,15 @@
        9004  Microchip REAL ICE
        900a  PICkit3
        c001  PicoLCD 20x4
+       f4b5  SmartScope
        f8da  Hughski Ltd. ColorHug
+       f91c  SPROG IIv3
        faff  Dangerous Prototypes BusPirate v4 Bootloader mode
        fb00  Dangerous Prototypes BusPirate v4
        fbb2  GCUSB-nStep stepper motor controller
        fbba  DiscFerret Magnetic Disc Analyser (bootloader mode)
        fbbb  DiscFerret Magnetic Disc Analyser (active mode)
+       fc1e  Bachrus Speedometer Interface
        fc92  Open Bench Logic Sniffer
        ffef  PICoPLC [APStech]
 04d9  Holtek Semiconductor, Inc.
@@ -4830,6 +4843,7 @@
        0402  Genius LuxeMate i200 Keyboard
        0403  KU-0420 keyboard
        0418  KU-0418 Tactical Pad
+       0618  RG-0618U Wireless HID Receiver & KG-0609 Wireless Keyboard with Touchpad
        0760  Acer KU-0760 Keyboard
        0841  HP Multimedia Keyboard
        0860  2.4G Multimedia Wireless Kit
@@ -5131,7 +5145,7 @@
        0015  ViewMate Desktop Mouse CC2201
        00d3  00052486 / Laser Mouse M1052 [hama]
        0171  SPCA1527A/SPCA1528 SD card camera (Mass Storage mode)
-       0201  RS232C Adapter
+       0201  SPCP825 RS232C Adapter
        0232  Fingerprint
        0538  Wireless Optical Mouse 2.4G [Bright]
        0561  Flexcam 100
@@ -9699,6 +9713,7 @@
        0102  ADSL
        0301  RNIS
 08e4  Pioneer Corp.
+       0185  DDJ-WeGO2
 08e5  Litronic
 08e6  Gemalto (was Gemplus)
        0001  GemPC-Touch 430
@@ -11047,6 +11062,8 @@
        300c  TT-connect T-3650 CI
        300d  TT-connect CT-3650 CI
        300e  TT-connect C-2400
+       3012  TT-connect CT2-4650 CI
+       3014  TT-TVStick CT2-4400
 0b49  ASCII Corp.
        064f  Trance Vibrator
 0b4b  Pine Corp. Ltd.
@@ -11382,7 +11399,7 @@
        2320  USB 3.0 bridge [Portable Expansion Drive]
        3008  FreeAgent Desk 1TB
        3101  FreeAgent XTreme 640GB
-       3312  SRD00F2 [Expansion Desktop Drive 2TB]
+       3312  SRD00F2 Expansion Desktop Drive (STBV)
        3320  SRD00F2 [Expansion Desktop Drive]
        3332  Expansion
        5020  FreeAgent GoFlex
@@ -11390,6 +11407,7 @@
        5030  FreeAgent GoFlex Upgrade Cable STAE104
        5031  FreeAgent GoFlex USB 3.0
        5070  FreeAgent GoFlex Desk
+       5071  FreeAgent GoFlex Desk
        50a1  FreeAgent GoFlex Desk
        50a5  FreeAgent GoFlex Desk USB 3.0
        5121  FreeAgent GoFlex
@@ -11398,6 +11416,7 @@
        a0a1  Backup Plus Desktop
        a0a4  Backup Plus Desktop Drive
        ab00  Slim Portable Drive
+       ab20  Backup Plus Portable Drive
 0bc3  IPWireless, Inc.
        0001  UMTS-TDD (TD-CDMA) modem
 0bc4  Microcube Corp.
@@ -11454,6 +11473,7 @@
        0171  Mass Storage Device
        0176  Mass Storage Device
        0178  Mass Storage Device
+       0179  RTL8188ETV Wireless LAN 802.11n Network Adapter
        0184  RTS5182 Card Reader
        0186  Card Reader
        0301  multicard reader
@@ -11461,6 +11481,7 @@
        2831  RTL2831U DVB-T
        2832  RTL2832U DVB-T
        2838  RTL2838 DVB-T
+       5730  HP 2.0MP High Definition Webcam
        8150  RTL8150 Fast Ethernet Adapter
        8151  RTL8151 Adapteon Business Mobile Networks BV
        8171  RTL8188SU 802.11n WLAN Adapter
@@ -12024,8 +12045,22 @@
        0027  Sphairon Homelink 1202 802.11n Wireless Adapter [Atheros AR9170]
 0ce5  Validation Technologies International
        0003  Matrix
-0ce9  pico Technology
+0ce9  Pico Technology
        1001  PicoScope3000 series PC Oscilloscope
+       1007  PicoScope 2000 series PC Oscilloscope
+       1008  PicoScope 5000 series PC Oscilloscope
+       1009  PicoScope 4000 series PC Oscilloscope
+       100e  PicoScope 6000 series PC Oscilloscope
+       1012  PicoScope 3000A series PC Oscilloscope
+       1016  PicoScope 2000A series PC Oscilloscope
+       1018  PicoScope 4000A series PC Oscilloscope
+       1200  PicoScope 2000 series PC Oscilloscope
+       1201  PicoScope 3000 series PC Oscilloscope
+       1202  PicoScope 4000 series PC Oscilloscope
+       1203  PicoScope 5000 series PC Oscilloscope
+       1204  PicoScope 6000 series PC Oscilloscope
+       1211  PicoScope 3000 series PC Oscilloscope
+       1212  PicoScope 4000 series PC Oscilloscope
 0cf1  e-Conn Electronic Co., Ltd
 0cf2  ENE Technology, Inc.
        6220  SD Card Reader (SG361)
@@ -12353,6 +12388,7 @@
 0db0  Micro Star International
        1020  PC2PC WLAN Card
        1967  Bluetooth Dongle
+       3713  Primo 73
        3801  Motorola Bluetooth 2.1+EDR Device
        4011  Medion Flash XL V2.0 Card Reader
        4023  Lexar Mobile Card Reader
@@ -12391,6 +12427,7 @@
 0db7  ELCON Systemtechnik
        0002  Goldpfeil P-LAN
 0dba  Digidesign
+       1000  Mbox 1 [Mbox]
        3000  Mbox 2
 0dbc  A&D Medical
        0003  AND Serial Cable [AND Smart Cable]
@@ -12658,6 +12695,8 @@
        0002  Wrist PDA
 0e6a  Megawin Technology Co., Ltd
        0101  MA100 [USB-UART Bridge IC]
+       030b  Truly Ergonomic Computer Keyboard (Device Firmware Update mode)
+       030c  Truly Ergonomic Computer Keyboard
        6001  GEMBIRD Flexible keyboard KB-109F-B-DE
 0e6f  Logic3
        0003  Freebird wireless Controller
@@ -13203,6 +13242,8 @@
 1039  devolo AG
        0824  1866 802.11bg [Texas Instruments TNETW1450]
        2140  dsl+ 1100 duo
+103a  PSA
+       f000  Actia Evo XS
 103d  Stanton
        0100  ScratchAmp
        0101  ScratchAmp
@@ -13251,6 +13292,7 @@
        0010  Yubikey
        0110  Yubikey NEO OTP
        0111  Yubikey NEO OTP+CCID
+       0200  U2F Gnubby
        0211  Gnubby
 1053  Immanuel Electronics Co., Ltd
 1054  BMS International Beheer N.V.
@@ -13265,24 +13307,27 @@
        0500  hub
        0702  Passport External HDD
        0704  Passport External HDD
-       070a  My Passport Essential SE, My Passport for Mac (WDBAAB)
-       071a  My Passport
+       070a  My Passport Essential (WDBAAA), My Passport for Mac (WDBAAB), My Passport Essential SE (WDBABM), My Passport SE for Mac (WDBABW)
+       070b  My Passport Elite (WDBAAC)
+       070c  My Passport Studio (WDBAAE)
+       071a  My Passport Essential (WDBAAA)
+       071d  My Passport Studio (WDBALG)
        0730  My Passport Essential (WDBACY)
-       0740  My Passport
+       0740  My Passport Essential (WDBACY)
        0741  My Passport Ultra
        0742  My Passport Essential SE
        0748  My Passport (WDBKXH)
-       0810  My Passport Ultra
+       0810  My Passport Ultra (WDBZFP)
        0900  MyBook Essential External HDD
-       0901  My Book Essential Edition (Green Ring)
-       0902  My Book Pro Edition
+       0901  My Book Essential Edition (Green Ring) (WDG1U)
+       0902  My Book Pro Edition (WDG1T)
        0903  My Book Premium Edition
-       0910  MyBook Essential External HDD
+       0910  My Book Essential Edition (Green Ring) (WDG1U)
        1001  Elements Desktop (WDE1U)
        1003  Elements 1000 GB
        1010  Elements Portable (WDBAAR)
        1021  Elements Desktop (WDBAAU)
-       1023  Elements SE
+       1023  Elements SE Portable (WDBABV)
        1048  Elements Portable (WDBU6Y)
        10a2  Elements SE Portable (WDBPCK)
        10a8  Elements Portable (WDBUZG)
@@ -13290,8 +13335,12 @@
        1103  My Book Studio
        1104  MyBook Mirror Edition External HDD
        1105  My Book Studio II
-       1123  My Book 3.0
-       1140  My Book Essential USB3.0
+       1110  My Book Essential (WDBAAF), My Book for Mac (WDBAAG)
+       1111  My Book Elite (WDBAAH)
+       1112  My Book Studio (WDBAAJ), My Book Studio LX (WDBACH)
+       1123  My Book 3.0 (WDBABP)
+       1130  My Book Essential (WDBACW)
+       1140  My Book Essential (WDBACW)
 1059  Giesecke & Devrient GmbH
        000b  StarSign Bio Token 3.0
 105c  Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd
@@ -14053,6 +14102,8 @@
        2043  Magicolor 2530DL
        2045  Magicolor 2500W
        2049  Magicolor 2490MF
+133e  Kemper Digital GmbH
+       0815  Virus TI Desktop
 1342  Mobility
        0200  EasiDock 200 Hub
        0201  EasiDock 200 Keyboard and Mouse Port
@@ -14088,10 +14139,11 @@
        0004  Touch Panel Controller
 134e  Digby's Bitpile, Inc. DBA D Bit
 1357  P&E Microcomputer Systems
+       0089  OpenSDA - CDC Serial Port
        0503  USB-ML-12 HCS08/HCS12 Multilink
        0504  DEMOJM
 1366  SEGGER
-       0101  J-Link ARM
+       0101  J-Link PLUS
 136b  STEC
 1370  Swissbit
        0323  Swissmemory cirrusWHITE
@@ -14124,6 +14176,7 @@
        0018  Fingerprint scanner
        003c  VFS471 Fingerprint Reader
        003d  VFS491
+       003f  VFS495 Fingerprint Reader
        0050  Swipe Fingerprint Sensor
 138e  Jungo LTD
        9000  Raisonance S.A. STM32 ARM evaluation board
@@ -14236,6 +14289,7 @@
        5116  Integrated Webcam
        5122  2M Integrated Webcam
        5126  PC Cam
+       5130  Integrated Webcam
        5702  UVC VGA Webcam
        5710  UVC VGA Webcam
        5716  UVC VGA Webcam
@@ -14431,6 +14485,7 @@
        0010  Bluebird [Ambit]
        0019  Duck [Ambit2]
        001a  Colibri [Ambit2 S]
+       001d  Greentit [Ambit2 R]
 1497  Panstrong Company Ltd.
 1498  Microtek International Inc.
        a090  DVB-T Tuner
@@ -16567,8 +16622,17 @@
        00dc  aes220 FPGA Mini-Module
 2478  Tripp-Lite
        2008  U209-000-R Serial Port
+249c  M2Tech s.r.l.
 2632  TwinMOS
        3209  7-in-1 Card Reader
+2639  Xsens
+       0001  MTi-10 IMU
+       0002  MTi-20 VRU
+       0003  MTi-30 AHRS
+       0011  MTi-100 IMU
+       0012  MTi-200 VRU
+       0013  MTi-300 AHRS
+       0017  MTi-G-700 GPS INS
 2650  Electronics For Imaging, Inc. [hex]
 2659  Sundtek
        1101  TNT DVB-T/DAB/DAB+/FM