Update.

diff --git a/iab.txt b/iab.txt
index ada522aa555d1e5c80f7cb2e4680860f2a6c6888..fcd9440999ee860ac4054686fb148c240d4a35d7 100644 (file)
--- a/iab.txt
+++ b/iab.txt
@@ -1,4 +1,4 @@
-  Generated: Sat, 04 Oct 2014 05:00:03 -0400
+  Generated: Wed, 08 Oct 2014 05:00:03 -0400
 
   OUI                          Organization
   IAB Range                            Organization

diff --git a/oui.txt b/oui.txt
index 61c5b2aa7bcb12916ba42a817994bd0838f2e5d6..df112f6c1e0da3faef3842429f26fcc2bc45f4b8 100644 (file)
--- a/oui.txt
+++ b/oui.txt
@@ -1,4 +1,4 @@
-  Generated: Sat, 04 Oct 2014 05:00:03 -0400
+  Generated: Wed, 08 Oct 2014 05:00:03 -0400
 
   OUI/MA-L                     Organization
   company_id                   Organization
@@ -91306,6 +91306,13 @@
                                North Syracuse NY 13212
                                UNITED STATES
 
+  3C-1E-04   (hex)             D-Link International
+  3C1E04     (base 16)         D-Link International
+                               1 Internal Business Park, #03-12,
+                               The Synergy
+                               609917
+                               SINGAPORE
+
   3C-1E-13   (hex)             HANGZHOU SUNRISE TECHNOLOGY CO., LTD
   3C1E13     (base 16)         HANGZHOU SUNRISE TECHNOLOGY CO., LTD
                                No.9, LongTan Road, CangQian Town, YuHang District, Hangzhou, China
@@ -94187,6 +94194,12 @@
                                Las Rozas de Madrid Madrid 28230
                                SPAIN
 
+  4C-76-25   (hex)             Dell Inc.
+  4C7625     (base 16)         Dell Inc.
+                               One Dell way
+                               Round Rock Texas 78682
+                               UNITED STATES
+
   4C-77-4F   (hex)             Embedded Wireless Labs
   4C774F     (base 16)         Embedded Wireless Labs
                                702 Level 7 Uptown 2 No.2
@@ -101342,6 +101355,12 @@
                                Scottsdale AZ 85258
                                UNITED STATES
 
+  74-96-37   (hex)             Todaair Electronic Co., Ltd
+  749637     (base 16)         Todaair Electronic Co., Ltd
+                               F.6 Electronic Building, No.1 Shuinan Guangdeli Road，Peng’Jiang District, Jiangmen, Guangdong, China
+                               JiangMen Guangdong 529000
+                               CHINA
+
   74-99-75   (hex)             IBM Corporation
   749975     (base 16)         IBM Corporation
                                4400 North First Street
@@ -105290,6 +105309,12 @@
                                Shenzhen GuangDong 518057
                                CHINA
 
+  88-E6-03   (hex)             Avotek corporation
+  88E603     (base 16)         Avotek corporation
+                               9-17, Dongil-ro 174-gil, Nowon-gu, Seoul
+                               Seoul Seoul 139-808
+                               KOREA, REPUBLIC OF
+
   88-E7-12   (hex)             Whirlpool Corporation
   88E712     (base 16)         Whirlpool Corporation
                                750 Monte Dr.
@@ -114511,10 +114536,10 @@
                                Shenzhen Guangdong 518067
                                CHINA
 
-  BC-E7-67   (hex)             TDX Electronics Co., Ltd
-  BCE767     (base 16)         TDX Electronics Co., Ltd
+  BC-E7-67   (hex)             Quanzhou  TDX Electronics Co., Ltd
+  BCE767     (base 16)         Quanzhou  TDX Electronics Co., Ltd
                                Hi-tech Park economic and tech development zone
-                               Quanzhou Fujian province 362212
+                               Quanzhou Fujian province 362005
                                CHINA
 
   BC-EA-2B   (hex)             CityCom GmbH
@@ -120980,6 +121005,13 @@
                                Sopot pomorskie 81-855
                                POLAND
 
+  E0-FF-F7   (hex)             Softiron Inc.
+  E0FFF7     (base 16)         Softiron Inc.
+                               6540 Central Avenue
+                               Unit O
+                               Newark California 94560
+                               UNITED STATES
+
   E4-04-39   (hex)             TomTom Software Ltd
   E40439     (base 16)         TomTom Software Ltd
                                20th Floor Euston Tower

diff --git a/pci.ids b/pci.ids
index d256c5fd75913c2932ee79910aabd728f1d1c96c..7d82dd2e4104d7315383c91799b499fafaa9164d 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2014.10.04
-#      Date:    2014-10-04 03:15:01
+#      Version: 2014.10.08
+#      Date:    2014-10-08 03:15:02
 #
 #      Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #      PCI ID Project at http://pci-ids.ucw.cz/.
@@ -17843,7 +17843,7 @@
        0612  AD612 Data Acquisition Device
        0614  MF614 Multifunction I/O Card
        0622  AD622 Data Acquisition Device
-       0624  MF624 Multifunction I/O Card
+       0624  MF624 Multifunction I/O PCI Card
        0625  MF625 3-phase Motor Driver
        0634  MF634 Multifunction I/O PCIe Card
 186f  WiNRADiO Communications
@@ -18248,6 +18248,9 @@
        0401  P4080
        0408  P4040E
        0409  P4040
+       0440  T4240 with security
+       0441  T4240 without security
+       0446  T4160 with security
        580c  MPC5121e
        7010  MPC8641 PCI Host Bridge
        7011  MPC8641D PCI Host Bridge
@@ -25392,6 +25395,7 @@
        a168  Sunrise Point-H PCI Root Port #18
        a169  Sunrise Point-H PCI Root Port #19
        a16a  Sunrise Point-H PCI Root Port #20
+       a170  Sunrise Point-H HD Audio
        a620  6400/6402 Advanced Memory Buffer (AMB)
        b152  21152 PCI-to-PCI Bridge
                8086 b152  21152 PCI-to-PCI Bridge

diff --git a/udev/60-keyboard.hwdb b/udev/60-keyboard.hwdb
index 8a1baa7c4bea638fdb9242bd8a00cb1d7c2cc106..59f467b7841d089f2d93d2a46cc505c390ba05c8 100644 (file)
--- a/udev/60-keyboard.hwdb
+++ b/udev/60-keyboard.hwdb
@@ -153,6 +153,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnASUS:pn*
 
 keyboard:name:Asus WMI hotkeys:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:pvr*
 keyboard:name:Eee PC WMI hotkeys:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:pvr*
+keyboard:name:Asus Laptop extra buttons:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:pvr*
  KEYBOARD_KEY_6b=f21                                    # Touchpad Toggle
 
 ###########################################################
@@ -1094,7 +1095,7 @@ keyboard:name:Toshiba*input*device:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSatellite*P75
  KEYBOARD_KEY_13c=brightnessdown
  KEYBOARD_KEY_13d=brightnessup
  KEYBOARD_KEY_13e=switchvideomode
- KEYBOARD_KEY_13f=touchpad_toggle
+ KEYBOARD_KEY_13f=f21                                   # Touchpad toggle
  KEYBOARD_KEY_9e=wlan
 
 ###########################################################