[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 00548de4ad0a02524e8fa88e6c4605e65e151f6a

15 Feb 2015

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  00548de4ad0a02524e8fa88e6c4605e65e151f6a (commit)
       via  78d060860bd7a10e44d147fe73e5c63fa6edcbc7 (commit)
       via  ef36b9d4d49e452497b1ec8ce370fd609de52fcf (commit)
       via  9e7099af47002f2edc9eeca76d41496f779b7b0f (commit)
       via  4fc61b9a098ceda37677bb4752eb7ff83a6d40ed (commit)
       via  00f99775f438df6a33c6d0130da33d4ed7d9d4dc (commit)
       via  dea158f2fc4bc94686f3fa7918c3a0ccc0b3b41c (commit)
      from  0cf8de0502d01f2f9f7f1f7b68c2740733ba542a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 00548de4ad0a02524e8fa88e6c4605e65e151f6a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Feb 15 13:30:30 2015 +0100
Update GeoIP database 2015-02-15
commit 78d060860bd7a10e44d147fe73e5c63fa6edcbc7
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Feb 15 13:24:27 2015 +0100
Update the hardware database
commit ef36b9d4d49e452497b1ec8ce370fd609de52fcf
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Feb 15 13:21:22 2015 +0100
tzdata: Update to version 2015a
commit 9e7099af47002f2edc9eeca76d41496f779b7b0f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Feb 15 13:16:08 2015 +0100
fireinfo: Update to version 2.1.11
commit 4fc61b9a098ceda37677bb4752eb7ff83a6d40ed
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 11 19:36:55 2015 +0100
Rootfile update
commit 00f99775f438df6a33c6d0130da33d4ed7d9d4dc
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 11 19:36:22 2015 +0100
librstp: Make an independent package
commit dea158f2fc4bc94686f3fa7918c3a0ccc0b3b41c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 11 15:15:47 2015 +0100
strongswan: Create configuration for better interoperability
Also import some upstream fixes for connection stability.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/collectd                   |   20 +-
 config/rootfiles/common/openvpn                    |    2 +-
 config/rootfiles/core/86/filelists/files           |    1 +
 .../{oldcore/44 => core/86}/filelists/hwdata       |    0
 config/rootfiles/packages/asterisk                 |   46 +-
 config/rootfiles/packages/libsrtp                  |   40 +
 config/strongswan/charon.conf                      |  302 +++
 lfs/GeoIP                                          |    4 +-
 lfs/asterisk                                       |    2 +-
 lfs/fireinfo                                       |    8 +-
 lfs/hwdata                                         |    3 +
 lfs/libsrtp                                        |    4 +
 lfs/strongswan                                     |    6 +
 lfs/tzdata                                         |    6 +-
 src/hwdata/pci.ids                                 | 2710 ++++++++++++++++----
 src/hwdata/usb.ids                                 |  996 ++++++-
 ...on-t-crash-when-no-bogomips-are-available.patch |   61 -
 ...Read-board-model-from-device-tree-in-proc.patch |   72 -
 ...ert-vendor-model-for-ARM-to-old-behaviour.patch |   70 -
 src/patches/strongswan-5.2.2-issue-816.patch       |   13 +
 .../strongswan-5.2.2-issue-819-cd2c30a.patch       |   50 +
 21 files changed, 3503 insertions(+), 913 deletions(-)
 copy config/rootfiles/{oldcore/44 => core/86}/filelists/hwdata (100%)
 create mode 100644 config/rootfiles/packages/libsrtp
 create mode 100644 config/strongswan/charon.conf
 delete mode 100644 src/patches/fireinfo/0001-bogomips-Don-t-crash-when-no-bogomips-are-available.patch
 delete mode 100644 src/patches/fireinfo/0002-ARM-Read-board-model-from-device-tree-in-proc.patch
 delete mode 100644 src/patches/fireinfo/0003-Revert-vendor-model-for-ARM-to-old-behaviour.patch
 create mode 100644 src/patches/strongswan-5.2.2-issue-816.patch
 create mode 100644 src/patches/strongswan-5.2.2-issue-819-cd2c30a.patch
Difference in files:

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 5c2064d..72b2dee 100644
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -213,15 +213,18 @@ usr/lib/collectd/write_http.so
 usr/lib/libcollectdclient.so
 usr/lib/libcollectdclient.so.0
 usr/lib/libcollectdclient.so.0.0.0
-#usr/lib/perl5/site_perl/5.12.3/Collectd
-#usr/lib/perl5/site_perl/5.12.3/Collectd.pm
-#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins
-#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins/Monitorus.pm
-#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins/OpenVZ.pm
-#usr/lib/perl5/site_perl/5.12.3/Collectd/Unixsock.pm
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Collectd
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Collectd/.packlist
+#usr/lib/perl5/Collectd
+#usr/lib/perl5/Collectd.pm
+#usr/lib/perl5/Collectd/Plugins
+#usr/lib/perl5/Collectd/Plugins/OpenVZ.pm
+#usr/lib/perl5/Collectd/Unixsock.pm
+#usr/lib/perl5/i586-linux-thread-multi
+#usr/lib/perl5/i586-linux-thread-multi/auto
+#usr/lib/perl5/i586-linux-thread-multi/auto/Collectd
+#usr/lib/perl5/i586-linux-thread-multi/auto/Collectd/.packlist
+#usr/lib/perl5/i586-linux-thread-multi/perllocal.pod
 #usr/lib/pkgconfig/libcollectdclient.pc
+#usr/man/man3/Collectd::Unixsock.3
 usr/sbin/collectd
 usr/sbin/collectdmon
 #usr/share/collectd
@@ -230,7 +233,6 @@ usr/share/collectd/types.db
 #usr/share/man/man1/collectd-nagios.1
 #usr/share/man/man1/collectd.1
 #usr/share/man/man1/collectdmon.1
-#usr/share/man/man3/Collectd::Unixsock.3
 #usr/share/man/man5/collectd-email.5
 #usr/share/man/man5/collectd-exec.5
 #usr/share/man/man5/collectd-java.5
diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index d1b836a..b58e30c 100644
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -17,7 +17,6 @@ usr/sbin/openvpn
 #usr/share/doc/openvpn/README.polarssl
 #usr/share/doc/openvpn/management-notes.txt
 #usr/share/man/man8/openvpn.8
-var/ipfire/ovpn
 var/ipfire/ovpn/ca
 var/ipfire/ovpn/caconfig
 var/ipfire/ovpn/ccd
@@ -32,3 +31,4 @@ var/ipfire/ovpn/ovpn-leases.db
 var/ipfire/ovpn/ovpnconfig
 var/ipfire/ovpn/scripts
 var/ipfire/ovpn/settings
+var/log/openvpn
diff --git a/config/rootfiles/core/86/filelists/files b/config/rootfiles/core/86/filelists/files
index 9a07cbc..5bdca35 100644
--- a/config/rootfiles/core/86/filelists/files
+++ b/config/rootfiles/core/86/filelists/files
@@ -6,6 +6,7 @@ etc/rc.d/init.d/leds
 opt/pakfire/etc/pakfire.conf
 usr/lib/firewall/rules.pl
 usr/local/bin/update-bootloader
+usr/local/share/GeoIP/GeoIP.dat
 var/ipfire/header.pl
 var/ipfire/langs
 var/ipfire/lang.pl
diff --git a/config/rootfiles/core/86/filelists/hwdata b/config/rootfiles/core/86/filelists/hwdata
new file mode 120000
index 0000000..ced9116
--- /dev/null
+++ b/config/rootfiles/core/86/filelists/hwdata
@@ -0,0 +1 @@
+../../../common/hwdata
\ No newline at end of file
diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index 332c22b..6654621 100755
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -1,6 +1,6 @@
-usr/lib/libsrtp.so
 etc/asterisk
 etc/logrotate.d/asterisk
+etc/rc.d/init.d/asterisk
 etc/rc.d/rc0.d/K30asterisk
 etc/rc.d/rc3.d/S30asterisk
 etc/rc.d/rc6.d/K30asterisk
@@ -156,38 +156,6 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/xml.h
 #usr/include/asterisk/xmldoc.h
 #usr/include/asterisk/xmpp.h
-#usr/include/srtp
-#usr/include/srtp/aes.h
-#usr/include/srtp/aes_cbc.h
-#usr/include/srtp/aes_icm.h
-#usr/include/srtp/alloc.h
-#usr/include/srtp/auth.h
-#usr/include/srtp/cipher.h
-#usr/include/srtp/config.h
-#usr/include/srtp/crypto.h
-#usr/include/srtp/crypto_kernel.h
-#usr/include/srtp/crypto_math.h
-#usr/include/srtp/crypto_types.h
-#usr/include/srtp/cryptoalg.h
-#usr/include/srtp/datatypes.h
-#usr/include/srtp/err.h
-#usr/include/srtp/gf2_8.h
-#usr/include/srtp/hmac.h
-#usr/include/srtp/integers.h
-#usr/include/srtp/kernel_compat.h
-#usr/include/srtp/key.h
-#usr/include/srtp/null_auth.h
-#usr/include/srtp/null_cipher.h
-#usr/include/srtp/prng.h
-#usr/include/srtp/rand_source.h
-#usr/include/srtp/rdb.h
-#usr/include/srtp/rdbx.h
-#usr/include/srtp/rtp.h
-#usr/include/srtp/sha1.h
-#usr/include/srtp/srtp.h
-#usr/include/srtp/stat.h
-#usr/include/srtp/ut_sim.h
-#usr/include/srtp/xfm.h
 #usr/lib/asterisk
 #usr/lib/asterisk/modules
 usr/lib/asterisk/modules/app_adsiprog.so
@@ -298,7 +266,6 @@ usr/lib/asterisk/modules/format_h263.so
 usr/lib/asterisk/modules/format_h264.so
 usr/lib/asterisk/modules/format_ilbc.so
 usr/lib/asterisk/modules/format_jpeg.so
-#usr/lib/asterisk/modules/format_ogg_vorbis.so
 usr/lib/asterisk/modules/format_pcm.so
 usr/lib/asterisk/modules/format_siren14.so
 usr/lib/asterisk/modules/format_siren7.so
@@ -370,7 +337,6 @@ usr/lib/asterisk/modules/res_convert.so
 usr/lib/asterisk/modules/res_crypto.so
 usr/lib/asterisk/modules/res_curl.so
 usr/lib/asterisk/modules/res_fax.so
-#usr/lib/asterisk/modules/res_fax_spandsp.so
 usr/lib/asterisk/modules/res_format_attr_celt.so
 usr/lib/asterisk/modules/res_format_attr_h263.so
 usr/lib/asterisk/modules/res_format_attr_h264.so
@@ -393,7 +359,6 @@ usr/lib/asterisk/modules/res_timing_pthread.so
 usr/lib/asterisk/modules/res_timing_timerfd.so
 usr/lib/libasteriskssl.so
 usr/lib/libasteriskssl.so.1
-#usr/lib/libsrtp.a
 #usr/lib/pkgconfig/asterisk.pc
 usr/sbin/astcanary
 usr/sbin/astdb2bdb
@@ -420,7 +385,7 @@ var/ipfire/asterisk/app_mysql.conf
 var/ipfire/asterisk/app_skel.conf
 var/ipfire/asterisk/asterisk.adsi
 var/ipfire/asterisk/asterisk.conf
-#var/ipfire/asterisk/asterisk.makeopts
+var/ipfire/asterisk/asterisk.logrotate
 var/ipfire/asterisk/calendar.conf
 var/ipfire/asterisk/ccss.conf
 var/ipfire/asterisk/cdr.conf
@@ -874,6 +839,12 @@ var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26
 var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.15
 var/lib/asterisk/sounds/en/1-for-am-2-for-pm.gsm
 var/lib/asterisk/sounds/en/1-yes-2-no.gsm
+#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26
+#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
+#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26
+#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
+#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26
+#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
 var/lib/asterisk/sounds/en/OfficeSpace.gsm
 var/lib/asterisk/sounds/en/Randulo-allison.gsm
 var/lib/asterisk/sounds/en/SIP_Test_Failure.gsm
@@ -2884,4 +2855,3 @@ var/spool/asterisk/voicemail/default/1234/INBOX
 var/spool/asterisk/voicemail/default/1234/en
 var/spool/asterisk/voicemail/default/1234/en/busy.gsm
 var/spool/asterisk/voicemail/default/1234/en/unavail.gsm
-etc/rc.d/init.d/asterisk
diff --git a/config/rootfiles/packages/libsrtp b/config/rootfiles/packages/libsrtp
new file mode 100644
index 0000000..105f3f0
--- /dev/null
+++ b/config/rootfiles/packages/libsrtp
@@ -0,0 +1,40 @@
+#usr/include/srtp
+#usr/include/srtp/aes.h
+#usr/include/srtp/aes_cbc.h
+#usr/include/srtp/aes_gcm_ossl.h
+#usr/include/srtp/aes_icm.h
+#usr/include/srtp/aes_icm_ossl.h
+#usr/include/srtp/alloc.h
+#usr/include/srtp/auth.h
+#usr/include/srtp/cipher.h
+#usr/include/srtp/config.h
+#usr/include/srtp/crypto.h
+#usr/include/srtp/crypto_kernel.h
+#usr/include/srtp/crypto_math.h
+#usr/include/srtp/crypto_types.h
+#usr/include/srtp/cryptoalg.h
+#usr/include/srtp/datatypes.h
+#usr/include/srtp/ekt.h
+#usr/include/srtp/err.h
+#usr/include/srtp/getopt_s.h
+#usr/include/srtp/gf2_8.h
+#usr/include/srtp/hmac.h
+#usr/include/srtp/integers.h
+#usr/include/srtp/kernel_compat.h
+#usr/include/srtp/key.h
+#usr/include/srtp/null_auth.h
+#usr/include/srtp/null_cipher.h
+#usr/include/srtp/prng.h
+#usr/include/srtp/rand_source.h
+#usr/include/srtp/rdb.h
+#usr/include/srtp/rdbx.h
+#usr/include/srtp/rtp.h
+#usr/include/srtp/rtp_priv.h
+#usr/include/srtp/sha1.h
+#usr/include/srtp/srtp.h
+#usr/include/srtp/srtp_priv.h
+#usr/include/srtp/stat.h
+#usr/include/srtp/ut_sim.h
+#usr/include/srtp/xfm.h
+usr/lib/libsrtp.so
+#usr/lib/pkgconfig/libsrtp.pc
diff --git a/config/strongswan/charon.conf b/config/strongswan/charon.conf
new file mode 100644
index 0000000..a5ff0be
--- /dev/null
+++ b/config/strongswan/charon.conf
@@ -0,0 +1,302 @@
+# Options for the charon IKE daemon.
+charon {
+    # Accept unencrypted ID and HASH payloads in IKEv1 Main Mode.
+    accept_unencrypted_mainmode_messages = yes
+
+    # Maximum number of half-open IKE_SAs for a single peer IP.
+    # block_threshold = 5
+
+    # Whether relations in validated certificate chains should be cached in
+    # memory.
+    # cert_cache = yes
+
+    # Send Cisco Unity vendor ID payload (IKEv1 only).
+    cisco_unity = yes
+
+    # Close the IKE_SA if setup of the CHILD_SA along with IKE_AUTH failed.
+    # close_ike_on_child_failure = no
+
+    # Number of half-open IKE_SAs that activate the cookie mechanism.
+    # cookie_threshold = 10
+
+    # Use ANSI X9.42 DH exponent size or optimum size matched to cryptographic
+    # strength.
+    # dh_exponent_ansi_x9_42 = yes
+
+    # DNS server assigned to peer via configuration payload (CP).
+    # dns1 =
+
+    # DNS server assigned to peer via configuration payload (CP).
+    # dns2 =
+
+    # Enable Denial of Service protection using cookies and aggressiveness
+    # checks.
+    # dos_protection = yes
+
+    # Compliance with the errata for RFC 4753.
+    # ecp_x_coordinate_only = yes
+
+    # Free objects during authentication (might conflict with plugins).
+    # flush_auth_cfg = no
+
+    # Maximum size (complete IP datagram size in bytes) of a sent IKE fragment
+    # when using proprietary IKEv1 or standardized IKEv2 fragmentation (0 for
+    # address family specific        default values). If specified this limit is
+    # used for both IPv4 and IPv6.
+    # fragment_size = 0
+
+    # Name of the group the daemon changes to after startup.
+    # group =
+
+    # Timeout in seconds for connecting IKE_SAs (also see IKE_SA_INIT DROPPING).
+    # half_open_timeout = 30
+
+    # Enable hash and URL support.
+    # hash_and_url = no
+
+    # Allow IKEv1 Aggressive Mode with pre-shared keys as responder.
+    # i_dont_care_about_security_and_use_aggressive_mode_psk = no
+
+    # A space-separated list of routing tables to be excluded from route
+    # lookups.
+    # ignore_routing_tables =
+
+    # Maximum number of IKE_SAs that can be established at the same time before
+    # new connection attempts are blocked.
+    # ikesa_limit = 0
+
+    # Number of exclusively locked segments in the hash table.
+    ikesa_table_segments = 4
+
+    # Size of the IKE_SA hash table.
+    ikesa_table_size = 32
+
+    # Whether to close IKE_SA if the only CHILD_SA closed due to inactivity.
+    # inactivity_close_ike = no
+
+    # Limit new connections based on the current number of half open IKE_SAs,
+    # see IKE_SA_INIT DROPPING in strongswan.conf(5).
+    init_limit_half_open = 1000
+
+    # Limit new connections based on the number of queued jobs.
+    # init_limit_job_load = 0
+
+    # Causes charon daemon to ignore IKE initiation requests.
+    # initiator_only = no
+
+    # Install routes into a separate routing table for established IPsec
+    # tunnels.
+    # install_routes = yes
+
+    # Install virtual IP addresses.
+    # install_virtual_ip = yes
+
+    # The name of the interface on which virtual IP addresses should be
+    # installed.
+    # install_virtual_ip_on =
+
+    # Check daemon, libstrongswan and plugin integrity at startup.
+    # integrity_test = no
+
+    # A comma-separated list of network interfaces that should be ignored, if
+    # interfaces_use is specified this option has no effect.
+    # interfaces_ignore =
+
+    # A comma-separated list of network interfaces that should be used by
+    # charon. All other interfaces are ignored.
+    # interfaces_use =
+
+    # NAT keep alive interval.
+    # keep_alive = 20s
+
+    # Plugins to load in the IKE daemon charon.
+    # load =
+
+    # Determine plugins to load via each plugin's load option.
+    # load_modular = no
+
+    # Maximum packet size accepted by charon.
+    # max_packet = 10000
+
+    # Enable multiple authentication exchanges (RFC 4739).
+    # multiple_authentication = yes
+
+    # WINS servers assigned to peer via configuration payload (CP).
+    # nbns1 =
+
+    # WINS servers assigned to peer via configuration payload (CP).
+    # nbns2 =
+
+    # UDP port used locally. If set to 0 a random port will be allocated.
+    # port = 500
+
+    # UDP port used locally in case of NAT-T. If set to 0 a random port will be
+    # allocated.  Has to be different from charon.port, otherwise a random port
+    # will be allocated.
+    # port_nat_t = 4500
+
+    # By default public IPv6 addresses are preferred over temporary ones (RFC
+    # 4941), to make connections more stable. Enable this option to reverse
+    # this.
+    # prefer_temporary_addrs = no
+
+    # Process RTM_NEWROUTE and RTM_DELROUTE events.
+    # process_route = yes
+
+    # Delay in ms for receiving packets, to simulate larger RTT.
+    # receive_delay = 0
+
+    # Delay request messages.
+    # receive_delay_request = yes
+
+    # Delay response messages.
+    # receive_delay_response = yes
+
+    # Specific IKEv2 message type to delay, 0 for any.
+    # receive_delay_type = 0
+
+    # Size of the AH/ESP replay window, in packets.
+    # replay_window = 32
+
+    # Base to use for calculating exponential back off, see IKEv2 RETRANSMISSION
+    # in strongswan.conf(5).
+    # retransmit_base = 1.8
+
+    # Timeout in seconds before sending first retransmit.
+    # retransmit_timeout = 4.0
+
+    # Number of times to retransmit a packet before giving up.
+    # retransmit_tries = 5
+
+    # Interval to use when retrying to initiate an IKE_SA (e.g. if DNS
+    # resolution failed), 0 to disable retries.
+    # retry_initiate_interval = 0
+
+    # Initiate CHILD_SA within existing IKE_SAs.
+    # reuse_ikesa = yes
+
+    # Numerical routing table to install routes to.
+    # routing_table =
+
+    # Priority of the routing table.
+    # routing_table_prio =
+
+    # Delay in ms for sending packets, to simulate larger RTT.
+    # send_delay = 0
+
+    # Delay request messages.
+    # send_delay_request = yes
+
+    # Delay response messages.
+    # send_delay_response = yes
+
+    # Specific IKEv2 message type to delay, 0 for any.
+    # send_delay_type = 0
+
+    # Send strongSwan vendor ID payload
+    # send_vendor_id = no
+
+    # Number of worker threads in charon.
+    # threads = 16
+
+    # Name of the user the daemon changes to after startup.
+    # user =
+
+    crypto_test {
+
+        # Benchmark crypto algorithms and order them by efficiency.
+        # bench = no
+
+        # Buffer size used for crypto benchmark.
+        # bench_size = 1024
+
+        # Number of iterations to test each algorithm.
+        # bench_time = 50
+
+        # Test crypto algorithms during registration (requires test vectors
+        # provided by the test-vectors plugin).
+        # on_add = no
+
+        # Test crypto algorithms on each crypto primitive instantiation.
+        # on_create = no
+
+        # Strictly require at least one test vector to enable an algorithm.
+        # required = no
+
+        # Whether to test RNG with TRUE quality; requires a lot of entropy.
+        # rng_true = no
+
+    }
+
+    host_resolver {
+
+        # Maximum number of concurrent resolver threads (they are terminated if
+        # unused).
+        # max_threads = 3
+
+        # Minimum number of resolver threads to keep around.
+        # min_threads = 0
+
+    }
+
+    leak_detective {
+
+        # Includes source file names and line numbers in leak detective output.
+        # detailed = yes
+
+        # Threshold in bytes for leaks to be reported (0 to report all).
+        # usage_threshold = 10240
+
+        # Threshold in number of allocations for leaks to be reported (0 to
+        # report all).
+        # usage_threshold_count = 0
+
+    }
+
+    processor {
+
+        # Section to configure the number of reserved threads per priority class
+        # see JOB PRIORITY MANAGEMENT in strongswan.conf(5).
+        priority_threads {
+
+        }
+
+    }
+
+    # Section containing a list of scripts (name = path) that are executed when
+    # the daemon is started.
+    start-scripts {
+
+    }
+
+    # Section containing a list of scripts (name = path) that are executed when
+    # the daemon is terminated.
+    stop-scripts {
+
+    }
+
+    tls {
+
+        # List of TLS encryption ciphers.
+        # cipher =
+
+        # List of TLS key exchange methods.
+        # key_exchange =
+
+        # List of TLS MAC algorithms.
+        # mac =
+
+        # List of TLS cipher suites.
+        # suites =
+
+    }
+
+    x509 {
+
+        # Discard certificates with unsupported or unknown critical extensions.
+        # enforce_critical = yes
+
+    }
+
+}
+
diff --git a/lfs/GeoIP b/lfs/GeoIP
index 17064fb..882d1a0 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
 include Config
VER        = 1.17
-DATVER     = 06052014
+DATVER     = 15022015
THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = aba5fc86202337c53a33bbc47d2083d0
+GeoIP.dat-$(DATVER).gz_MD5 = 508e3c10da15f2722774cf4014863976
install : $(TARGET)
diff --git a/lfs/asterisk b/lfs/asterisk
index bd76de7..cd9821c 100755
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -30,7 +30,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
 PAK_VER    = 13
-DEPS       = "sqlite"
+DEPS       = "libsrtp sqlite"
###############################################################################
 # Top-level Rules
diff --git a/lfs/fireinfo b/lfs/fireinfo
index 78a5e37..3295388 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
include Config
-VER        = 2.1.10
+VER        = 2.1.11
THISAPP    = fireinfo-v$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cc7838cda22d7d4e9bb177aa1dc6f25a
+$(DL_FILE)_MD5 = 093799207ab7397cc7f2d5eb45868c69
install : $(TARGET)
@@ -71,10 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/0001-bogomips-Don-t-crash-when-no-bogomips-are-available.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/0002-ARM-Read-board-model-from-device-tree-in-proc.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/0003-Revert-vendor-model-for-ARM-to-old-behaviour.patch
-
    cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
    cd $(DIR_APP) && ./configure --prefix=/usr
    cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/hwdata b/lfs/hwdata
index 6804849..9d8e99c 100644
--- a/lfs/hwdata
+++ b/lfs/hwdata
@@ -29,6 +29,9 @@ VER        = ipfire
 THISAPP    = hwdata
 TARGET     = $(DIR_INFO)/$(THISAPP)
+# https://pci-ids.ucw.cz/v2.2/pci.ids
+# http://www.linux-usb.org/usb.ids
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
diff --git a/lfs/libsrtp b/lfs/libsrtp
index fa0475f..7e2d144 100644
--- a/lfs/libsrtp
+++ b/lfs/libsrtp
@@ -30,6 +30,10 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = libsrtp
+PAK_VER    = 1
+
+DEPS       = ""
###############################################################################
 # Top-level Rules
diff --git a/lfs/strongswan b/lfs/strongswan
index b2be4c1..ff97ab8 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -79,6 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch
+	cd $(DIR_APP) && patch -Np1 --ignore-whitespace \
+		-i $(DIR_SRC)/src/patches/strongswan-5.2.2-issue-816.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.2.2-issue-819-cd2c30a.patch
cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
    cd $(DIR_APP) && ./configure \
@@ -116,5 +119,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs
    ln -sf $(CONFIG_ROOT)/crls  /etc/ipsec.d/crls
+	install -v -m 644 $(DIR_SRC)/config/strongswan/charon.conf \
+		/etc/strongswan.d/charon.conf
+
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/tzdata b/lfs/tzdata
index 9d60793..11dc03f 100644
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -24,7 +24,7 @@
include Config
-VER        = 2014j
+VER        = 2015a
 TZDATA_VER = $(VER)
 TZCODE_VER = $(VER)
@@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
 tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
 tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
-tzdata$(TZDATA_VER).tar.gz_MD5 = 2d7ea9c309f0d4e162e426e568290ca3
-tzcode$(TZCODE_VER).tar.gz_MD5 = 970119e9765bc5a9320368851c91ecb6
+tzdata$(TZDATA_VER).tar.gz_MD5 = 4ed11c894a74a5ea64201b1c6dbb8831
+tzcode$(TZCODE_VER).tar.gz_MD5 = 8f375ede46ae137fbac047ac431bda37
install : $(TARGET)
diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids
index 219c7c2..f16fb54 100644
--- a/src/hwdata/pci.ids
+++ b/src/hwdata/pci.ids
@@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2014.04.30
-#	Date:    2014-04-30 03:15:02
+#	Version: 2015.02.14
+#	Date:    2015-02-14 03:15:02
 #
 #	Maintained by Martin Mares mj@ucw.cz and other volunteers from the
 #	PCI ID Project at http://pci-ids.ucw.cz/.
@@ -257,6 +257,7 @@
    	4c53 1300  P017 mezzanine (32-bit PMC)
    	4c53 1310  P017 mezzanine (64-bit PMC)
    002f  MegaRAID SAS 2208 IOV [Thunderbolt]
+		1028 1f39  SPERC8-e
    	1028 1f3e  SPERC 8
    0030  53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI
    	0e11 00da  ProLiant ML 350
@@ -348,6 +349,9 @@
    	1028 1f48  PERC H730P Mini (for blades)
    	1028 1f49  PERC H730 Mini
    	1028 1f4a  PERC H730 Mini (for blades)
+		1028 1f4d  PERC FD33xS
+		1028 1f4f  PERC H730P Slim
+		1028 1f54  PERC FD33xD
    	17aa 1052  ThinkServer RAID 720i
    	17aa 1053  ThinkServer RAID 720ix
    005e  SAS1066 PCI-X Fusion-MPT SAS
@@ -485,7 +489,7 @@
    0096  SAS3004 PCI-Express Fusion-MPT SAS-3
    0097  SAS3008 PCI-Express Fusion-MPT SAS-3
    	1028 1f45  12GB/s HBA internal
-		1028 1f46  12GB/s HBA external
+		1028 1f46  12Gbps HBA
    0407  MegaRAID
    	1000 0530  MegaRAID 530 SCSI 320-0X RAID Controller
    	1000 0531  MegaRAID 531 SCSI 320-4X RAID Controller
@@ -588,7 +592,7 @@
    1306  Kaveri
    1307  Kaveri
    1308  Kaveri HDMI/DP Audio Controller
-	1309  Kaveri [Radeon R7 Graphics]
+	1309  Kaveri [Radeon R6/R7 Graphics]
    130a  Kaveri [Radeon R6 Graphics]
    130b  Kaveri [Radeon R4 Graphics]
    130c  Kaveri [Radeon R7 Graphics]
@@ -1030,7 +1034,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)
@@ -1433,6 +1437,7 @@
    	148c 2117  Bravo X700 (Secondary)
    5f57  R423 [Radeon X800 XT]
    6600  Mars [Radeon HD 8670A/8670M/8750M]
+		103c 1952  ProBook 455 G1
    6601  Mars [Radeon HD 8730M]
    	103c 2100  FirePro M4100
    6602  Mars
@@ -1440,7 +1445,9 @@
    6604  Opal XT [Radeon R7 M265]
    6605  Opal PRO [Radeon R7 M260]
    6606  Mars XTX [Radeon HD 8790M]
+		1028 0684  FirePro W4170M
    6607  Mars LE [Radeon HD 8530M / R5 M240]
+	6608  Oland GL [FirePro W2100]
    6610  Oland XT [Radeon HD 8670 / R7 250]
    	1019 0030  Radeon HD 8670
    	1028 2120  Radeon R7 250
@@ -1462,6 +1469,8 @@
    6631  Oland
    6640  Saturn XT [FirePro M6100]
    6641  Saturn PRO [Radeon HD 8930M]
+	6646  Bonaire XT [Radeon R9 M280X]
+	6647  Bonaire PRO [Radeon R9 M270X]
    6649  Bonaire [FirePro W5100]
    6650  Bonaire
    6651  Bonaire
@@ -1485,7 +1494,7 @@
    6664  Jet XT [Radeon R5 M240]
    6665  Jet PRO [Radeon R5 M230]
    6667  Jet ULT [Radeon R5 M230]
-	666f  Sun LE [Radeon HD 8550M]
+	666f  Sun LE [Radeon HD 8550M / R5 M230]
    6670  Hainan
    6704  Cayman PRO GL [FirePro V7900]
    6707  Cayman LE GL [FirePro V5900]
@@ -1971,6 +1980,7 @@
    	1002 0310  FirePro S9000
    	1002 0420  Radeon Sky 700
    	1002 0422  Radeon Sky 900
+		1002 0710  FirePro S9050
    	1002 0b0e  FirePro S10000 Passive
    	1002 0b2a  FirePro S10000
    	1028 030c  FirePro W8000
@@ -1992,6 +2002,8 @@
    	1043 9999  ARES II
    	1092 3000  Tahiti XT2 [Radeon HD 7970 GHz Edition]
    	1458 2261  Tahiti XT2 [Radeon HD 7970 GHz Edition OC]
+# GV-R928XOC-3GD
+		1458 3001  Tahiti XTL [Radeon R9 280X OC]
    	1462 2774  MSI R7970 TF 3GD5/OC BE
    	1682 3211  Double D HD 7970 Black Edition
 # FX-797A-TNBC
@@ -2006,6 +2018,7 @@
    	1002 0b01  Radeon HD 8950 OEM
    	1002 3000  Tahiti PRO2 [Radeon HD 7950 Boost]
    	1462 3000  Radeon HD 8950 OEM
+		174b a003  Radeon R9 280
    679b  Malta [Radeon HD 7990]
    	1002 0b28  Radeon HD 8990 OEM
    	1002 0b2a  Radeon HD 7990
@@ -2013,15 +2026,15 @@
    	148c 8990  Radeon HD 8990 OEM
    679e  Tahiti LE [Radeon HD 7870 XT]
    679f  Tahiti
-	67a0  Hawaii XT GL
-	67a1  Hawaii GL
+	67a0  Hawaii XT GL [FirePro W9100]
+	67a1  Hawaii PRO GL [FirePro W8100]
    67a2  Hawaii GL
    67a8  Hawaii
    67a9  Hawaii
    67aa  Hawaii
    67b0  Hawaii XT [Radeon R9 290X]
    67b1  Hawaii PRO [Radeon R9 290]
-	67b9  Vesuvius [Radeon R9 295 X2]
+	67b9  Vesuvius [Radeon R9 295X2]
    67be  Hawaii LE
    6800  Wimbledon XT [Radeon HD 7970M]
    	1002 0124  Radeon HD 7970M
@@ -2057,6 +2070,10 @@
    6822  Venus PRO [Radeon E8860]
    6823  Venus PRO [Radeon HD 8850M / R9 M265X]
    6825  Heathrow XT [Radeon HD 7870M]
+		1028 053f  FirePro M6000
+		1028 05cd  FirePro M6000
+		1028 15cd  FirePro M6000
+		103c 176c  FirePro M6000
    	8086 2111  Chelsea PRO
    6826  Chelsea LP [Radeon HD 7700M Series]
    6827  Heathrow PRO [Radeon HD 7850M/8850M]
@@ -2064,6 +2081,7 @@
    6829  Cape Verde
    682a  Venus PRO
    682b  Venus LE [Radeon HD 8830M]
+	682c  Cape Verde GL [FirePro W4100]
    682d  Chelsea XT GL [FirePro M4000]
    682f  Chelsea LP [Radeon HD 7730M]
    	103c 1851  Radeon HD 7750M
@@ -2083,6 +2101,7 @@
    	1019 0030  Radeon HD 8760 OEM
    	103c 6890  Radeon HD 8760 OEM
    	1043 8760  Radeon HD 8760 OEM
+		1462 2710  R7770-PMD1GD5
    	174b 8304  Radeon HD 8760 OEM
    683f  Cape Verde PRO [Radeon HD 7750 / R7 250E]
    6840  Thames [Radeon HD 7500M/7600M Series]
@@ -2108,6 +2127,7 @@
    	1028 05a3  Radeon HD 7670M
    	1028 05b9  Radeon HD 7670M
    	1028 05bb  Radeon HD 7670M
+		103c 1789  FirePro M2000
    	103c 17f1  Radeon HD 7570M
    	103c 17f4  Radeon HD 7650M
    	103c 1813  Radeon HD 7590M
@@ -2655,9 +2675,19 @@
    	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
+		103c 2269  Radeon R7 M260
+		103c 22c8  Radeon R7 M260
+		1179 f903  Radeon R7 M260
+		1179 f934  Radeon R7 M260
    6901  Topaz PRO [Radeon R5 M255]
    6920  Tonga
+	6921  Amethyst XT [Radeon R9 M295X]
+	692b  Tonga PRO GL [FirePro W7100]
+	692f  Tonga XT GL [FirePro W8100]
+	6938  Amethyst XT [Radeon R9 M295X Mac Edition]
+	6939  Tonga PRO [Radeon R9 285]
    700f  RS100 AGP Bridge
    7010  RS200/RS250 AGP Bridge
    7100  R520 [Radeon X1800 XT]
@@ -2708,6 +2738,7 @@
    	103c 30c1  6910p
    718a  RV516/M64 [Mobility Radeon X2300]
    718b  RV516/M62 [Mobility Radeon X1350]
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    718c  RV516/M62-CSP64 [Mobility Radeon X1350]
    718d  RV516/M64-CSP128 [Mobility Radeon X1450]
    7193  RV516 [Radeon X1550 Series]
@@ -2966,6 +2997,7 @@
    95c6  RV620 LE [Radeon HD 3450 AGP]
    95c9  RV620 LE [Radeon HD 3450 PCI]
    95cc  RV620 GL [FirePro V3700]
+	95cd  RV620 [FirePro 2450]
    95cf  RV620 GL [FirePro 2260]
    960f  RS780 HDMI Audio [Radeon (HD) 3000 Series]
    9610  RS780 [Radeon HD 3200]
@@ -3028,13 +3060,14 @@
    983d  Temash [Radeon HD 8250/8280G]
    983e  Kabini
    983f  Kabini
-	9850  Mullins [Radeon APU A6-6200 with R3 Graphics]
-	9851  Mullins [Radeon APU A4-6000 with R2 Graphics]
-	9852  Mullins [Radeon APU A4-6000 with R2 Graphics]
-	9853  Mullins [Radeon APU E2-4000 with R2 Graphics]
-	9854  Mullins [Radeon APU E2-3700 with R2 Graphics]
-	9855  Mullins [Radeon APU XX-2450M with R3 Graphics]
-	9856  Mullins [Radeon APU XX-2200M with R2 Graphics]
+	9840  Kabini HDMI/DP Audio
+	9850  Mullins [Radeon R3 Graphics]
+	9851  Mullins [Radeon R4/R5 Graphics]
+	9852  Mullins [Radeon R2 Graphics]
+	9853  Mullins [Radeon R2 Graphics]
+	9854  Mullins [Radeon R3E Graphics]
+	9855  Mullins [Radeon R6 Graphics]
+	9856  Mullins [Radeon R1E/R2E Graphics]
    9857  Mullins [Radeon APU XX-2200M with R2 Graphics]
    9858  Mullins
    9859  Mullins
@@ -3458,6 +3491,7 @@
    0160  64bit/66MHz PCI ATM 155 MMF
    016e  GXT4000P Graphics Adapter
    0170  GXT6000P Graphics Adapter
+		1092 0172  Fire GL2
    017d  GXT300P Graphics Adapter
    0180  Snipe chipset SCSI controller
    	1014 0241  iSeries 2757 DASD IOA
@@ -3528,6 +3562,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
@@ -3991,6 +4026,8 @@
    	1028 1f03  PERC 5/i Integrated RAID Controller
    0016  PowerEdge Expandable RAID controller S300
    	1028 1f24  PERC S300 Controller
+# NV-RAM Adapter used in Dell DR appliances
+	0073  NV-RAM Adapter
 1029  Siemens Nixdorf IS
 102a  LSI Logic
    0000  HYDRA
@@ -4163,6 +4200,7 @@
    	1028 028d  PowerEdge T410 MGA G200eW WPCM450
    	1028 029c  PowerEdge M710 MGA G200eW WPCM450
    	1028 02a4  PowerEdge T310 MGA G200eW WPCM450
+		15d9 0624  X9SCM-F Motherboard
    	15d9 a811  H8DGU
    0533  MGA G200EH
    	103c 3381  iLO4
@@ -4438,6 +4476,7 @@
    000a  PCI-to-PCI bridge
    0016  SiS961/2/3 SMBus controller
    0018  SiS85C503/5513 (LPC Bridge)
+	0163  163 802.11b/g Wireless LAN Adapter
    0180  RAID bus controller 180 SATA/PATA  [SiS]
    0181  SATA
    0182  182 SATA/RAID Controller
@@ -4679,21 +4718,21 @@
    	103c 3211  Smart Array E200i
    	103c 3212  Smart Array E200
    3239  Smart Array Gen9 Controllers
-		103c 21bd  Smart Array
+		103c 21bd  P244br
    	103c 21be  Smart Array
-		103c 21bf  Smart Array
-		103c 21c0  Smart Array
+		103c 21bf  H240ar
+		103c 21c0  P440ar
    	103c 21c1  Smart Array
-		103c 21c2  Smart Array
-		103c 21c3  Smart Array
+		103c 21c2  P440
+		103c 21c3  P441
    	103c 21c4  Smart Array
    	103c 21c5  Smart Array
-		103c 21c6  Smart Array
-		103c 21c7  Smart Array
-		103c 21c8  Smart Array
+		103c 21c6  H244br
+		103c 21c7  H240
+		103c 21c8  H241
    	103c 21c9  Smart Array
    	103c 21ca  Smart Array
-		103c 21cb  Smart Array
+		103c 21cb  P840
    	103c 21cc  Smart Array
    	103c 21cd  Smart Array
    	103c 21ce  Smart Array
@@ -4765,6 +4804,7 @@
    3010  Samurai_1
    3020  Samurai_IDE
 1043  ASUSTeK Computer Inc.
+	0464  Radeon R9 270x GPU
    0675  ISDNLink P-IN100-ST-D
    	0675 1704  ISDN Adapter (PCI Bus, D, C)
    	0675 1707  ISDN Adapter (PCI Bus, DV, W)
@@ -5669,6 +5709,7 @@
    8000  10GbE Converged Network Adapter (TCP/IP Networking)
    8001  10GbE Converged Network Adapter (FCoE)
    8020  cLOM8214 1/10GbE Controller
+		1028 1f64  QMD8262-k 10G DP bNDC KR
    	103c 3346  CN1000Q Dual Port Converged Network Adapter
    	103c 3733  NC523SFP 10Gb 2-port Server Adapter
    	1077 0203  8200 Series Single Port 10GbE Converged Network Adapter (TCP/IP Networking)
@@ -5871,104 +5912,381 @@
 1093  National Instruments
    0160  PCI-DIO-96
    0162  PCI-MIO-16XE-50
-	1150  PCI-DIO-32HS High Speed Digital I/O Board
+	1150  PCI-6533 (PCI-DIO-32HS)
    1170  PCI-MIO-16XE-10
    1180  PCI-MIO-16E-1
    1190  PCI-MIO-16E-4
    11b0  PXI-6070E
-	11c0  PXI-6040e
-	11d0  PXI-6030e
-	1270  PCI-6032e
+	11c0  PXI-6040E
+	11d0  PXI-6030E
+	1270  PCI-6032E
+	1290  PCI-6704
+	12b0  PCI-6534
    1310  PCI-6602
+	1320  PXI-6533
    1330  PCI-6031E
-	1340  PCI-6033e
+	1340  PCI-6033E
    1350  PCI-6071E
    1360  PXI-6602
+	13c0  PXI-6508
+	1490  PXI-6534
    14e0  PCI-6110
    14f0  PCI-6111
    1580  PXI-6031E
    15b0  PXI-6071E
    1710  PXI-6509
+	17c0  PXI-5690
    17d0  PCI-6503
    1870  PCI-6713
    1880  PCI-6711
    18b0  PCI-6052E
    18c0  PXI-6052E
+	1920  PXI-6704
+	1930  PCI-6040E
+	19c0  PCI-4472
+	1aa0  PXI-4110
+	1ad0  PCI-6133
+	1ae0  PXI-6133
+	1e30  PCI-6624
+	1e40  PXI-6624
+	1e50  PXI-5404
    2410  PCI-6733
    2420  PXI-6733
    2430  PCI-6731
+	2470  PCI-4474
+	24a0  PCI-4065
+	24b0  PXI-4200
+	24f0  PXI-4472
+	2510  PCI-4472
+	2520  PCI-4474
+	27a0  PCI-6123
+	27b0  PXI-6123
    2880  DAQCard-6601
    2890  PCI-6036E
+	28a0  PXI-4461
+	28b0  PCI-6013
    28c0  PCI-6014
    28d0  PCI-5122
    28e0  PXI-5122
+	29f0  PXI-7334
+	2a00  PXI-7344
    2a60  PCI-6023E
    2a70  PCI-6024E
    2a80  PCI-6025E
-	2ab0  PXI-6025e
+	2ab0  PXI-6025E
+	2b10  PXI-6527
+	2b20  PCI-6527
    2b80  PXI-6713
    2b90  PXI-6711
    2c60  PCI-6601
    2c70  PXI-6601
    2c80  PCI-6035E
+	2c90  PCI-6703
    2ca0  PCI-6034E
+	2cb0  PCI-7344
    2cc0  PXI-6608
+	2d20  PXI-5600
    2db0  PCI-6608
+	2dc0  PCI-4070
+	2dd0  PXI-4070
+	2eb0  PXI-4472
+	2ec0  PXI-6115
+	2ed0  PCI-6115
+	2ee0  PXI-6120
+	2ef0  PCI-6120
+	2fd1  PCI-7334
+	2fd2  PCI-7350
+	2fd3  PCI-7342
+	2fd5  PXI-7350
+	2fd6  PXI-7342
+	7003  PCI-6551
+	7004  PXI-6551
+	700b  PXI-5421
+	700c  PCI-5421
+	7023  PXI-2593
    702c  PXI-7831R
    702d  PCI-7831R
    702e  PXI-7811R
    702f  PCI-7811R
+	7030  PCI-CAN (Series 2)
+	7031  PCI-CAN/2 (Series 2)
+	7032  PCI-CAN/LS (Series 2)
+	7033  PCI-CAN/LS2 (Series 2)
+	7034  PCI-CAN/DS (Series 2)
+	7035  PXI-8460 (Series 2, 1 port)
+	7036  PXI-8460 (Series 2, 2 ports)
+	7037  PXI-8461 (Series 2, 1 port)
+	7038  PXI-8461 (Series 2, 2 ports)
+	7039  PXI-8462 (Series 2)
+	703f  PXI-2566
+	7040  PXI-2567
+	7044  MXI-4 Connection Monitor
+	7047  PXI-6653
+	704c  PXI-2530
+	704f  PXI-4220
+	7050  PXI-4204
    7055  PXI-7830R
    7056  PCI-7830R
+	705a  PCI-CAN/XS (Series 2)
+	705b  PCI-CAN/XS2 (Series 2)
+	705c  PXI-8464 (Series 2, 1 port)
+	705d  PXI-8464 (Series 2, 2 ports)
+	705e  cRIO-9102
+	7060  PXI-5610
+	7064  PXI-1045 Trigger Routing Module
+	7065  PXI-6652
+	7066  PXI-6651
+	7067  PXI-2529
+	7068  PCI-CAN/SW (Series 2)
+	7069  PCI-CAN/SW2 (Series 2)
+	706a  PXI-8463 (Series 2, 1 port)
+	706b  PXI-8463 (Series 2, 2 ports)
+	7073  PCI-6723
    7074  PXI-7833R
+	7075  PXI-6552
+	7076  PCI-6552
+	707c  PXI-1428
+	707e  PXI-4462
+	7080  PXI-8430/2 (RS-232) Interface
+	7081  PXI-8431/2 (RS-485) Interface
    7083  PCI-7833R
-# Low-Cost, High-Current, 96 Ch, 5 V TTL/CMOS Digital I/O
    7085  PCI-6509
-	70a9  PCI-6528 (Digital I/O at 60V)
+	7086  PXI-6528
+	7087  PCI-6515
+	7088  PCI-6514
+	708c  PXI-2568
+	708d  PXI-2569
+	70a9  PCI-6528
    70aa  PCI-6229
    70ab  PCI-6259
    70ac  PCI-6289
+	70ad  PXI-6251
    70ae  PXI-6220
    70af  PCI-6221
    70b0  PCI-6220
+	70b1  PXI-6229
+	70b2  PXI-6259
+	70b3  PXI-6289
    70b4  PCI-6250
+	70b5  PXI-6221
    70b6  PCI-6280
    70b7  PCI-6254
-	70b8  PCI-6251 [M Series - High Speed Multifunction DAQ]
+	70b8  PCI-6251
+	70b9  PXI-6250
+	70ba  PXI-6254
+	70bb  PXI-6280
    70bc  PCI-6284
    70bd  PCI-6281
+	70be  PXI-6284
    70bf  PXI-6281
    70c0  PCI-6143
+	70c3  PCI-6511
+	70c4  PXI-7330
+	70c5  PXI-7340
+	70c6  PCI-7330
+	70c7  PCI-7340
+	70c8  PCI-6513
+	70c9  PXI-6515
+	70ca  PCI-1405
+	70cc  PCI-6512
+	70cd  PXI-6514
+	70ce  PXI-1405
+	70cf  PCIe-GPIB
+	70d0  PXI-2570
+	70d1  PXI-6513
+	70d2  PXI-6512
+	70d3  PXI-6511
+	70d4  PCI-6722
+	70d6  PXI-4072
+	70d7  PXI-6541
+	70d8  PXI-6542
+	70d9  PCI-6541
+	70da  PCI-6542
+	70db  PCI-8430/2 (RS-232) Interface
+	70dc  PCI-8431/2 (RS-485) Interface
+	70dd  PXI-8430/4 (RS-232) Interface
+	70de  PXI-8431/4 (RS-485) Interface
+	70df  PCI-8430/4 (RS-232) Interface
+	70e0  PCI-8431/4 (RS-485) Interface
+	70e1  PXI-2532
+	70e2  PXI-8430/8 (RS-232) Interface
+	70e3  PXI-8431/8 (RS-485) Interface
+	70e4  PCI-8430/8 (RS-232) Interface
+	70e5  PCI-8431/8 (RS-485) Interface
+	70e6  PXI-8430/16 (RS-232) Interface
+	70e7  PCI-8430/16 (RS-232) Interface
+	70e8  PXI-8432/2 (Isolated RS-232) Interface
+	70e9  PXI-8433/2 (Isolated RS-485) Interface
+	70ea  PCI-8432/2 (Isolated RS-232) Interface
+	70eb  PCI-8433/2 (Isolated RS-485) Interface
+	70ec  PXI-8432/4 (Isolated RS-232) Interface
+	70ed  PXI-8433/4 (Isolated RS-485) Interface
+	70ee  PCI-8432/4 (Isolated RS-232) Interface
+	70ef  PCI-8433/4 (Isolated RS-485) Interface
    70f0  PXI-5922
    70f1  PCI-5922
    70f2  PCI-6224
+	70f3  PXI-6224
+	70f6  cRIO-9101
+	70f7  cRIO-9103
+	70f8  cRIO-9104
+	70ff  PXI-6723
+	7100  PXI-6722
+	7104  PCIx-1429
+	7105  PCIe-1429
+	710a  PXI-4071
+	710d  PXI-6143
+	710e  PCIe-GPIB
+	710f  PXI-5422
+	7110  PCI-5422
+	7111  PXI-5441
+	7119  PXI-6561
+	711a  PXI-6562
+	711b  PCI-6561
+	711c  PCI-6562
+	7120  PCI-7390
    7121  PXI-5122EX
    7122  PCI-5122EX
-	7144  PXI-5124 (12-bit 200 MS/s Digitizer)
+	7123  PXIe-5653
+	7124  PCI-6510
+	7125  PCI-6516
+	7126  PCI-6517
+	7127  PCI-6518
+	7128  PCI-6519
+	7137  PXI-2575
+	713c  PXI-2585
+	713d  PXI-2586
+	7142  PXI-4224
+	7144  PXI-5124
    7145  PCI-5124
+	7146  PCI-6132
+	7147  PXI-6132
+	7148  PCI-6122
+	7149  PXI-6122
    714c  PXI-5114
    714d  PCI-5114
+	7150  PXI-2564
    7152  PCI-5640R
+	7156  PXI-1044 Trigger Routing Module
+	715d  PCI-1426
+	7167  PXI-5412
+	7168  PCI-5412
+	716b  PCI-6230
    716c  PCI-6225
-	717d  PCIE-6251
+	716d  PXI-6225
+	716f  PCI-4461
+	7170  PCI-4462
+	7171  PCI-6010
+	7174  PXI-8360
+	7177  PXI-6230
+	717d  PCIe-6251
    717f  PCIe-6259
+	7187  PCI-1410
+	718b  PCI-6521
+	718c  PXI-6521
+	7191  PCI-6154
    7193  PXI-7813R
    7194  PCI-7813R
-	71bc  PCI-6221 (37pin)
-	71d0  PXI-6143
+	7195  PCI-8254R
+	7197  PXI-5402
+	7198  PCI-5402
+	719f  PCIe-6535
+	71a0  PCIe-6536
+	71a3  PXI-5650
+	71a4  PXI-5652
+	71a5  PXI-2594
+	71a7  PXI-2595
+	71a9  PXI-2596
+	71aa  PXI-2597
+	71ab  PXI-2598
+	71ac  PXI-2599
+	71ad  PCI-GPIB+
+	71ae  PCIe-1430
+	71b7  PXI-1056 Trigger Routing Module
+	71b8  PXI-1045 Trigger Routing Module
+	71b9  PXI-1044 Trigger Routing Module
+	71bb  PXI-2584
+	71bc  PCI-6221 (37-pin)
+	71bf  PCIe-1427
+	71c5  PCI-6520
+	71c6  PXI-2576
+	71c7  cRIO-9072
    71dc  PCI-1588
+	71e0  PCI-6255
+	71e1  PXI-6255
+	71e2  PXI-5406
+	71e3  PCI-5406
+	71fc  PXI-4022
+	7209  PCI-6233
+	720a  PXI-6233
+	720b  PCI-6238
+	720c  PXI-6238
    7260  PXI-5142
    7261  PCI-5142
+	726d  PXI-5651
+	7273  PXI-4461
+	7274  PXI-4462
+	7279  PCI-6232
+	727a  PXI-6232
+	727b  PCI-6239
+	727c  PXI-6239
+	727e  SMBus Controller
+		1093 75ac  PXIe-8388
+		1093 75ad  PXIe-8389
+		1093 7650  PXIe-8381
+		1093 8360  PXIe-8360
+		1093 8370  PXIe-8370
+		1093 8375  PXIe-8375
+	7281  PCI-6236
+	7282  PXI-6236
+	7283  PXI-2554
+	7288  PXIe-5611
+	7293  PCIe-8255R
+	729d  cRIO-9074
+	72a4  PCIe-4065
+	72a7  PCIe-6537
    72a8  PXI-5152
    72a9  PCI-5152
    72aa  PXI-5105
    72ab  PCI-5105
    72b8  PXI-6682
+	72d0  PXI-2545
+	72d1  PXI-2546
+	72d2  PXI-2547
+	72d3  PXI-2548
+	72d4  PXI-2549
+	72d5  PXI-2555
+	72d6  PXI-2556
+	72d7  PXI-2557
+	72d8  PXI-2558
+	72d9  PXI-2559
+	72e8  PXIe-6251
+	72e9  PXIe-6259
+	72ef  PXI-4498
+	72f0  PXI-4496
+	72fb  PXIe-6672
+	730e  PXI-4130
    730f  PXI-5922EX
    7310  PCI-5922EX
+	731c  PXI-2535
+	731d  PXI-2536
+	7322  PXIe-6124
+	7327  PXI-6529
+	7331  PXIe-5602
+	7332  PXIe-5601
    7333  PXI-5900
+	7335  PXI-2533
+	7336  PXI-2534
+	7342  PXI-4461
    7349  PXI-5154
    734a  PCI-5154
+	7357  PXI-4065
+	7359  PXI-4495
+	7370  PXI-4461
+	7373  sbRIO-9601
+	7374  IOtech-9601
+	7375  sbRIO-9602
+	7378  sbRIO-9641
    737d  PXI-5124EX
    7384  PXI-7851R
    7385  PXI-7852R
@@ -5979,46 +6297,327 @@
    7392  PXI-7853R
    7393  PCIe-7841R
    7394  PCIe-7842R
+	7397  sbRIO-9611
+	7398  sbRIO-9612
+	7399  sbRIO-9631
+	739a  sbRIO-9632
+	739b  sbRIO-9642
+	73a1  PXIe-4498
+	73a2  PXIe-4496
    73a5  PXIe-5641R
+	73a7  PXI-8250 Chassis Monitor Module
+	73a8  PXI-8511 CAN/LS
+	73a9  PXI-8511 CAN/LS
+	73aa  PXI-8512 CAN/HS
+	73ab  PXI-8512 CAN/HS
+	73ac  PXI-8513 CAN/XS
+	73ad  PXI-8513 CAN/XS
+	73af  PXI-8516 LIN
+	73b1  PXI-8517 FlexRay
+	73b2  PXI-8531 CANopen
+	73b3  PXI-8531 CANopen
+	73b4  PXI-8532 DeviceNet
+	73b5  PXI-8532 DeviceNet
+	73b6  PCI-8511 CAN/LS
+	73b7  PCI-8511 CAN/LS
+	73b8  PCI-8512 CAN/HS
+	73b9  PCI-8512 CAN/HS
+	73ba  PCI-8513 CAN/XS
+	73bb  PCI-8513 CAN/XS
+	73bd  PCI-8516 LIN
+	73bf  PCI-8517 FlexRay
+	73c0  PCI-8531 CANopen
+	73c1  PCI-8531 CANopen
+	73c2  PCI-8532 DeviceNet
+	73c3  PCI-8532 DeviceNet
+	73c5  PXIe-2527
+	73c6  PXIe-2529
+	73c8  PXIe-2530
+	73c9  PXIe-2532
+	73ca  PXIe-2569
+	73cb  PXIe-2575
+	73cc  PXIe-2593
    73d5  PXI-7951R
    73d6  PXI-7952R
    73d7  PXI-7953R
    73e1  PXI-7854R
    73ec  PXI-7954R
+	73ed  cRIO-9073
    73f0  PXI-5153
    73f1  PCI-5153
+	73f4  PXI-2515
+	73f6  cRIO-9111
+	73f7  cRIO-9112
+	73f8  cRIO-9113
+	73f9  cRIO-9114
+	73fa  cRIO-9116
+	73fb  cRIO-9118
+	7404  PXI-4132
    7405  PXIe-6674T
+	7406  PXIe-6674
+	740e  PCIe-8430/16 (RS-232) Interface
+	740f  PCIe-8430/8 (RS-232) Interface
+	7410  PCIe-8431/16 (RS-485) Interface
+	7411  PCIe-8431/8 (RS-485) Interface
+	7414  PCIe-GPIB+
+	741c  PXI-5691
+	741d  PXI-5695
+	743c  CSC-3059
+	7448  PXI-2510
+	7454  PXI-2512
+	7455  PXI-2514
+	7456  PXIe-2512
+	7457  PXIe-2514
+	745a  PXI-6682H
    745e  PXI-5153EX
    745f  PCI-5153EX
    7460  PXI-5154EX
    7461  PCI-5154EX
+	746d  PXIe-5650
+	746e  PXIe-5651
+	746f  PXIe-5652
+	7472  PXI-2800
+	7495  PXIe-5603
+	7497  PXIe-5605
+	74ae  PXIe-2515
+	74b4  PXI-2531
+	74b5  PXIe-2531
+	74c1  PXIe-8430/16 (RS-232) Interface
+	74c2  PXIe-8430/8 (RS-232) Interface
+	74c3  PXIe-8431/16 (RS-485) Interface
+	74c4  PXIe-8431/8 (RS-485) Interface
+	74d5  PXIe-5630
+	74d9  PCIe-8432/2 (Isolated RS-232) Interface
+	74da  PCIe-8433/2 (Isolated RS-485) Interface
+	74db  PCIe-8432/4 (Isolated RS-232) Interface
+	74dc  PCIe-8433/4 (Isolated RS-485) Interface
+	74e8  NI 9148
+	7515  PCIe-8430/2 (RS-232) Interface
+	7516  PCIe-8430/4 (RS-232) Interface
+	7517  PCIe-8431/2 (RS-485) Interface
+	7518  PCIe-8431/4 (RS-485) Interface
+	751b  cRIO-9081
+	751c  cRIO-9082
+	7528  PXIe-4497
+	7529  PXIe-4499
+	752a  PXIe-4492
    7539  NI 9157
    753a  NI 9159
+	7598  PXI-2571
+	75a4  PXI-4131A
+	75b1  PCIe-7854R
+	75ba  PXI-2543
+	75bb  PXIe-2543
    75e5  PXI-6683
    75e6  PXI-6683H
+	75ef  PXIe-5632
+	761f  PXI-2540
+	7620  PXIe-2540
+	7621  PXI-2541
+	7622  PXIe-2541
    7626  NI 9154
    7627  NI 9155
-	b001  IMAQ-PCI-1408
-	b011  IMAQ-PXI-1408
-	b021  IMAQ-PCI-1424
-	b031  IMAQ-PCI-1413
-	b041  IMAQ-PCI-1407
-	b051  IMAQ-PXI-1407
-	b061  IMAQ-PCI-1411
-	b071  IMAQ-PCI-1422
-	b081  IMAQ-PXI-1422
-	b091  IMAQ-PXI-1411
+	7638  PXI-2720
+	7639  PXI-2722
+	763a  PXIe-2725
+	763b  PXIe-2727
+	763c  PXI-4465
+	764b  PXIe-2790
+	764c  PXI-2520
+	764d  PXI-2521
+	764e  PXI-2522
+	764f  PXI-2523
+	7654  PXI-2796
+	7655  PXI-2797
+	7656  PXI-2798
+	7657  PXI-2799
+	765d  PXI-2542
+	765e  PXIe-2542
+	765f  PXI-2544
+	7660  PXIe-2544
+	766d  PCIe-6535B
+	766e  PCIe-6536B
+	766f  PCIe-6537B
+	76a3  PXIe-6535B
+	76a4  PXIe-6536B
+	76a5  PXIe-6537B
+	9020  PXI-2501
+	9030  PXI-2503
+	9040  PXI-2527
+	9050  PXI-2565
+	9060  PXI-2590
+	9070  PXI-2591
+	9080  PXI-2580
+	9090  PCI-4021
+	90a0  PXI-4021
+	b001  PCI-1408
+	b011  PXI-1408
+	b021  PCI-1424
+	b022  PXI-1424
+	b031  PCI-1413
+	b041  PCI-1407
+	b051  PXI-1407
+	b061  PCI-1411
+	b071  PCI-1422
+	b081  PXI-1422
+	b091  PXI-1411
+	b0b1  PCI-1409
+	b0c1  PXI-1409
+	b0e1  PCI-1428
    c4c4  PXIe/PCIe Device
+		1093 728a  PXIe-5421
+		1093 728b  PXIe-5442
+		1093 728d  PXIe-5451
+		1093 72a2  PXIe-5122
+		1093 72da  PXIe-5422
+		1093 72f7  PXIe-6535
+		1093 72f8  PXIe-6536
+		1093 72f9  PXIe-6537
+		1093 7326  PCIe-6509
+		1093 736c  PXIe-4140
+		1093 738b  PXIe-5622
+		1093 73c4  PXIe-5450
+		1093 73c7  PXIe-6545
+		1093 73d4  PXIe-6544
+		1093 7425  PCIe-6320
+		1093 7427  PCIe-6321
+		1093 7428  PXIe-6323
+		1093 7429  PCIe-6323
+		1093 742a  PXIe-6341
+		1093 742b  PCIe-6341
+		1093 742c  PXIe-6343
+		1093 742d  PCIe-6343
+		1093 742f  PCIe-6351
+		1093 7431  PCIe-6353
+		1093 7432  PXIe-6361
+		1093 7433  PCIe-6361
+		1093 7434  PXIe-6363
+		1093 7435  PCIe-6363
+		1093 7436  PXIe-6356
+		1093 7437  PXIe-6358
+		1093 7438  PXIe-6366
+		1093 7439  PXIe-6368
+		1093 7468  PXIe-5185
+		1093 7469  PXIe-5186
+		1093 7492  PXIe-4300
+		1093 7498  PXIe-6548
+		1093 7499  PXIe-6547
+		1093 74a8  PXIe-4330
+		1093 74a9  PXIe-4331
+		1093 74b1  PXIe-4154
    	1093 74b2  PXIe-4353
+		1093 74b6  PCIe-1433
+		1093 74cd  PXIe-5643R
    	1093 74d0  PXIe-7961R
+		1093 74dd  PXIe-6376
+		1093 74de  PXIe-6378
    	1093 74e2  PXIe-7962R
    	1093 74e3  PXIe-7965R
+		1093 74e5  PXIe-4844
+		1093 74f3  PCIe-5140
+		1093 753c  PXIe-1435
+		1093 7548  PXIe-5622 (25MHz DDC)
+		1093 754d  PCIe-5155
+		1093 7551  PXIe-6556
    	1093 7553  PCIe-1473R
+		1093 7570  PCIe-1474R
+		1093 7571  PXIe-1475R
+		1093 7572  PXIe-1476R
+		1093 75a2  PXIe-5693
+		1093 75a3  PXIe-5694
+		1093 75a5  PXIe-4141
    	1093 75ce  PXIe-7966R
+		1093 75cf  PXIe-4357
+		1093 75d2  PXIe-RevB-5643R
+		1093 75d3  PXIe-5644R
+		1093 75ee  PXIe-5645R
+		1093 7613  PXIe-6555
+		1093 7619  PXIe-5185
+		1093 761a  PXIe-5186
+		1093 7629  PXIe-4142
+		1093 762a  PXIe-4143
+		1093 762b  PXIe-4138
+		1093 762c  PXIe-4144
+		1093 762d  PXIe-4145
+		1093 7644  PXIe-4841
+		1093 7658  PXIe-5162 (4CH)
+		1093 76ab  PXIe-4322
+		1093 76ad  PXIe-4112
+		1093 76ae  PXIe-4113
+		1093 76b5  PXIe-7971R
+		1093 76b6  PXIe-7972R
    	1093 76b7  PXIe-7975R
-		1093 76d0  PXIe-5160
+		1093 76c8  PXIe-6614
+		1093 76c9  PXIe-6612
+		1093 76cb  PXIe-5646R
+		1093 76cc  PXIe-5162 (2CH)
+		1093 76d0  PXIe-5160 (2CH)
+		1093 76d1  PXIe-5160 (4CH)
+		1093 76dc  PXIe-4610
+		1093 76fb  PCIe-1473R-LX110
+		1093 76fe  PXIe-5644R
+		1093 76ff  PXIe-5644R
+		1093 7700  PXIe-5644R
+		1093 7701  PXIe-5645R
+		1093 7702  PXIe-5645R
+		1093 7703  PXIe-5645R
+		1093 770c  PXIe-4139
+		1093 7711  PXIe-4464
+		1093 7716  PCIe-6612
+		1093 771e  PXIe-4339
+		1093 7735  cRIO-9033
+		1093 774b  cRIO-9031
+		1093 774d  cRIO-9034
+		1093 7755  cRIO-9030
+		1093 7777  PXIe-7976R
+		1093 7782  PXIe-5646R
+		1093 7783  PXIe-5646R
+		1093 7784  PXIe-5646R
+		1093 77a5  PXIe-6345
+		1093 77a6  PXIe-6355
+		1093 77a7  PXIe-6365
+		1093 77a8  PXIe-6375
+		1093 77b4  PXIe-7820R
+		1093 77b5  PXIe-7821R
+		1093 77b6  PXIe-7822R
+		1093 77b9  cRIO-9038
    c801  PCI-GPIB
-	c831  PCI-GPIB bridge
+	c811  PCI-GPIB+
+	c821  PXI-GPIB
+	c831  PMC-GPIB
+	c840  PCI-GPIB
+	d130  PCI-232/2 Interface
+	d140  PCI-232/4 Interface
+	d150  PCI-232/8 Interface
+	d160  PCI-485/2 Interface
+	d170  PCI-485/4 Interface
+	d190  PXI-8422/2 (Isolated RS-232) Interface
+	d1a0  PXI-8422/4 (Isolated RS-232) Interface
+	d1b0  PXI-8423/2 (Isolated RS-485) Interface
+	d1c0  PXI-8423/4 (Isolated RS-485) Interface
+	d1d0  PXI-8420/2 (RS-232) Interface
+	d1e0  PXI-8420/4 (RS-232) Interface
+	d1f0  PXI-8420/8 (RS-232) Interface
+	d1f1  PXI-8420/16 (RS-232) Interface
+	d230  PXI-8421/2 (RS-485) Interface
+	d240  PXI-8421/4 (RS-485) Interface
+	d250  PCI-232/2 (Isolated) Interface
+	d260  PCI-485/2 (Isolated) Interface
+	d270  PCI-232/4 (Isolated) Interface
+	d280  PCI-485/4 (Isolated) Interface
+	d290  PCI-485/8 Interface
+	d2a0  PXI-8421/8 (RS-485) Interface
+	d2b0  PCI-232/16 Interface
+	e111  PCI-CAN
+	e131  PXI-8461 (1 port)
+	e141  PCI-CAN/LS
+	e151  PXI-8460 (1 port)
+	e211  PCI-CAN/2
+	e231  PXI-8461 (2 ports)
+	e241  PCI-CAN/LS2
+	e251  PXI-8460 (2 ports)
+	e261  PCI-CAN/DS
+	e271  PXI-8462
 1094  First International Computers [FIC]
 # nee CMD Technology Inc
 1095  Silicon Image, Inc.
@@ -6055,6 +6654,7 @@
    	1095 3512  SiI 3512 SATALink Controller
    	1095 6512  SiI 3512 SATARaid Controller
    3531  SiI 3531 [SATALink/SATARaid] Serial ATA Controller
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
 1096  Alacron
 1097  Appian Technology
 1098  Quantum Designs (H.K.) Ltd
@@ -6498,6 +7098,7 @@
    	1369 c001  LX6464ES
    	1369 c201  LX1616ES
    	14b4 d10a  DekTec DTA-110T
+		14b4 d128  Dektec DTA-140
    	14b4 d140  Dektec DTA-140
    	1a0e 006f  Dektec DTA-111
    9060  PCI9060 32-bit 33MHz PCI <-> IOBus Bridge
@@ -7854,7 +8455,7 @@
    0365  MCP55 LPC Bridge
    0366  MCP55 LPC Bridge
    0367  MCP55 LPC Bridge
-	0368  MCP55 SMBus
+	0368  MCP55 SMBus Controller
    	1028 020c  PowerEdge M605 MCP55 SMBus
    	1028 0221  PowerEdge R805 MCP55 SMBus
    	147b 1c24  KN9 series mainboard
@@ -8255,6 +8856,8 @@
    063f  G94 [GeForce 9600 GE]
    0640  G96 [GeForce 9500 GT]
    0641  G96 [GeForce 9400 GT]
+		1682 4009  PV-T94G-ZAFG
+	0642  G96 [D9M-10]
    0643  G96 [GeForce 9500 GT]
    0644  G96 [GeForce 9500 GS]
    0645  G96 [GeForce 9500 GS]
@@ -8738,6 +9341,8 @@
    0beb  GF104 High Definition Audio Controller
    	1462 2322  N460GTX Cyclone 1GD5/OC
    0bee  GF116 High Definition Audio Controller
+	0bf0  Tegra2 PCIe x4 Bridge
+	0bf1  Tegra2 PCIe x2 Bridge
    0ca0  GT215 [GeForce GT 330]
    0ca2  GT215 [GeForce GT 320]
    0ca3  GT215 [GeForce GT 240]
@@ -8832,10 +9437,15 @@
    0e0a  GK104 HDMI Audio Controller
    0e0b  GK106 HDMI Audio Controller
    0e0c  GF114 HDMI Audio Controller
+	0e0f  GK208 HDMI/DP Audio Controller
+	0e12  TegraK1 PCIe x4 Bridge
+	0e13  TegraK1 PCIe x1 Bridge
    0e1a  GK110 HDMI Audio
    0e1b  GK107 HDMI Audio Controller
    	103c 197b  ZBook 15
    	1043 8428  GTX650-DC-1GD5
+	0e1c  Tegra3+ PCIe x4 Bridge
+	0e1d  Tegra3+ PCIe x2 Bridge
    0e22  GF104 [GeForce GTX 460]
    	1462 2322  N460GTX Cyclone 1GD5/OC
    0e23  GF104 [GeForce GTX 460 SE]
@@ -8846,11 +9456,14 @@
    0e3b  GF104GLM [Quadro 4000M]
    0f00  GF108 [GeForce GT 630]
    0f01  GF108 [GeForce GT 620]
+	0f02  GF108 [GeForce GT 730]
+	0fbb  GM204 High Definition Audio Controller
    0fc0  GK107 [GeForce GT 640 OEM]
    0fc1  GK107 [GeForce GT 640]
    0fc2  GK107 [GeForce GT 630 OEM]
    0fc6  GK107 [GeForce GTX 650]
    	1043 8428  GTX650-DC-1GD5
+	0fc8  GK107 [GeForce GT 740]
    0fcd  GK107M [GeForce GT 755M]
    0fce  GK107M [GeForce GT 640M LE]
    0fd1  GK107M [GeForce GT 650M]
@@ -8869,11 +9482,13 @@
    0fd5  GK107M [GeForce GT 650M Mac Edition]
    0fd8  GK107M [GeForce GT 640M Mac Edition]
    0fd9  GK107M [GeForce GT 645M]
+	0fdb  GK107M
    0fdf  GK107M [GeForce GT 740M]
    0fe0  GK107M [GeForce GTX 660M Mac Edition]
    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]
@@ -8886,6 +9501,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
@@ -8900,6 +9516,7 @@
    0ffd  GK107 [NVS 510]
    0ffe  GK107GL [Quadro K2000]
    0fff  GK107GL [Quadro 410]
+	1001  GK110B [GeForce GTX TITAN Z]
    1003  GK110 [GeForce GTX Titan LE]
    1004  GK110 [GeForce GTX 780]
    	3842 0784  GK110B [GeForce GTX 780 SC w/ ACX Cooler]
@@ -8923,6 +9540,7 @@
    1008  GK110 [GeForce GTX 780 Ti Rev. 2]
    100a  GK110B [GeForce GTX 780 Ti]
    100c  GK110B [GeForce GTX Titan Black]
+	101e  GK110GL [Tesla K20X]
    101f  GK110GL [Tesla K20]
    1020  GK110GL [Tesla K20X]
    1021  GK110GL [Tesla K20Xm]
@@ -8933,7 +9551,11 @@
    1027  GK110BGL [Tesla K40st]
    1028  GK110GL [Tesla K20m]
    1029  GK110BGL [Tesla K40s]
+	102a  GK110BGL [Tesla K40t]
+	102d  GK210GL [Tesla K80]
+	102e  GK110BGL [Tesla K40d]
    103a  GK110GL [Quadro K6000]
+	103c  GK110GL [Quadro K5200]
    1040  GF119 [GeForce GT 520]
    1042  GF119 [GeForce 510]
    1048  GF119 [GeForce 605]
@@ -8943,6 +9565,7 @@
    	10b0 104a  Gainward GeForce GT 610
    104b  GF119 [GeForce GT 625 OEM]
    104c  GF119 [GeForce GT 705]
+	104d  GF119 [GeForce GT 710]
    1050  GF119M [GeForce GT 520M]
    1051  GF119M [GeForce GT 520MX]
    1052  GF119M [GeForce GT 520M]
@@ -9002,6 +9625,7 @@
    10c5  GT218 [GeForce 405]
    10d8  GT218 [NVS 300]
    1140  GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M]
+		1019 999f  GeForce GT 720M
    	1025 0600  GeForce GT 620M
    	1025 0606  GeForce GT 620M
    	1025 064a  GeForce GT 620M
@@ -9042,8 +9666,35 @@
    	1025 0821  GeForce GT 720M
    	1025 0823  GeForce GT 720M
    	1025 0830  GeForce GT 720M
+		1025 0833  GeForce GT 720M
    	1025 0837  GeForce GT 720M
+		1025 083e  GeForce 820M
    	1025 0841  GeForce 710M
+		1025 0854  GeForce 820M
+		1025 0855  GeForce 820M
+		1025 0856  GeForce 820M
+		1025 0857  GeForce 820M
+		1025 0858  GeForce 820M
+		1025 0868  GeForce 820M
+		1025 0869  GeForce 810M
+		1025 0873  GeForce 820M
+		1025 0878  GeForce 820M
+		1025 087b  GeForce 820M
+		1025 087c  GeForce 810M
+		1025 0881  GeForce 820M
+		1025 088a  GeForce 820M
+		1025 089b  GeForce 820M
+		1025 090f  GeForce 820M
+		1025 0921  GeForce 820M
+		1025 092e  GeForce 810M
+		1025 092f  GeForce 820M
+		1025 093a  GeForce 820M
+		1025 093c  GeForce 820M
+		1025 093f  GeForce 820M
+		1025 0941  GeForce 820M
+		1025 0945  GeForce 820M
+		1025 0954  GeForce 820M
+		1025 0965  GeForce 820M
    	1028 054d  GeForce GT 630M
    	1028 054e  GeForce GT 630M
    	1028 0554  GeForce GT 620M
@@ -9063,11 +9714,21 @@
    	1028 05e0  GeForce GT 720M
    	1028 05e8  GeForce GT 630M
    	1028 05f4  GeForce GT 720M
+		1028 060f  GeForce GT 720M
+		1028 064e  GeForce 820M
+		1028 0652  GeForce 820M
+		1028 0653  GeForce 820M
+		1028 0655  GeForce 820M
+		1028 065e  GeForce 820M
+		1028 0662  GeForce 820M
+		1028 068d  GeForce 820M
    	103c 18ef  GeForce GT 630M
    	103c 18f9  GeForce GT 630M
    	103c 18fb  GeForce GT 630M
    	103c 18fd  GeForce GT 630M
    	103c 18ff  GeForce GT 630M
+		103c 2335  GeForce 820M
+		103c 2337  GeForce 820M
    	103c 2aef  GeForce GT 720A
    	103c 2af9  GeForce 710A
    	1043 10dd  NVS 5200M
@@ -9087,6 +9748,10 @@
    	1043 16cd  GeForce 820M
    	1043 16dd  GeForce 820M
    	1043 170d  GeForce 820M
+		1043 176d  GeForce 820M
+		1043 178d  GeForce 820M
+		1043 179d  GeForce 820M
+		1043 17dd  GeForce 820M
    	1043 2132  GeForce GT 620M
    	1043 2136  NVS 5200M
    	1043 21ba  GeForce GT 720M
@@ -9097,7 +9762,26 @@
    	1043 224a  GeForce GT 710M
    	1043 227a  GeForce 820M
    	1043 228a  GeForce 820M
+		1043 232a  GeForce 820M
+		1043 233a  GeForce 820M
+		1043 236a  GeForce 820M
+		1043 238a  GeForce 820M
    	1043 8595  GeForce GT 720M
+		1043 85ea  GeForce GT 720M
+		1043 85eb  GeForce 820M
+		1043 85ec  GeForce 820M
+		1043 85ee  GeForce GT 720M
+		1043 85f3  GeForce 820M
+		1043 860e  GeForce 820M
+		1043 861a  GeForce 820M
+		1043 861b  GeForce 820M
+		1043 8628  GeForce 820M
+		1043 8643  GeForce 820M
+		1043 864c  GeForce 820M
+		1043 8652  GeForce 820M
+		105b 0dac  GeForce GT 720M
+		105b 0dad  GeForce GT 720M
+		105b 0ef3  GeForce GT 720M
    	1072 152d  GeForce GT 720M
    	10cf 17f5  GeForce GT 720M
    	1179 fa01  GeForce 710M
@@ -9130,25 +9814,39 @@
    	144d c0e2  NVS 5200M
    	144d c0e3  NVS 5200M
    	144d c0e4  NVS 5200M
+		144d c10d  GeForce 820M
    	144d c652  GeForce GT 620M
    	144d c709  GeForce 710M
    	144d c711  GeForce 710M
    	144d c736  GeForce 710M
+		144d c737  GeForce 710M
+		144d c745  GeForce 820M
+		144d c750  GeForce 820M
    	1462 10b8  GeForce GT 710M
    	1462 10e9  GeForce GT 720M
    	1462 1116  GeForce 820M
    	1462 aa33  GeForce 720M
    	1462 aaa2  GeForce GT 720M
    	1462 aaa3  GeForce 820M
+		1462 acb2  GeForce GT 720M
+		1462 acc1  GeForce GT 720M
+		1462 ae61  GeForce 720M
+		1462 ae65  GeForce GT 720M
+		1462 ae6a  GeForce 820M
    	1462 ae71  GeForce GT 720M
+		14c0 0083  GeForce 820M
    	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
+		152d 1092  GeForce 820M
    	17aa 2200  NVS 5200M
    	17aa 2213  GeForce GT 720M
    	17aa 2220  GeForce GT 720M
@@ -9166,18 +9864,34 @@
    	17aa 369c  GeForce 820A
    	17aa 369d  GeForce 820A
    	17aa 369e  GeForce 820A
+		17aa 36a9  GeForce 820A
    	17aa 3800  GeForce GT 720M
    	17aa 3801  GeForce GT 720M
    	17aa 3802  GeForce GT 720M
    	17aa 3803  GeForce GT 720M
    	17aa 3804  GeForce GT 720M
+		17aa 3806  GeForce GT 720M
+		17aa 3808  GeForce GT 720M
+		17aa 380d  GeForce 820M
+		17aa 380e  GeForce 820M
+		17aa 380f  GeForce 820M
+		17aa 3811  GeForce 820M
+		17aa 3812  GeForce 820M
+		17aa 3813  GeForce 820M
+		17aa 3816  GeForce 820M
+		17aa 3818  GeForce 820M
+		17aa 381a  GeForce 820M
+		17aa 381c  GeForce 820M
    	17aa 3901  GeForce 610M / GT 620M
    	17aa 3902  GeForce 710M
    	17aa 3903  GeForce 610M/710M
    	17aa 3904  GeForce GT 620M/625M
    	17aa 3905  GeForce GT 720M
+		17aa 3907  GeForce 820M
    	17aa 3910  GeForce 720M
    	17aa 3912  GeForce 720M
+		17aa 3913  GeForce 820M
+		17aa 3915  GeForce 820M
    	17aa 3977  GeForce GT 720M
    	17aa 3983  GeForce 610M
    	17aa 5001  GeForce 610M
@@ -9196,15 +9910,23 @@
    	17aa 502d  GeForce 710M
    	17aa 502e  GeForce GT 720M
    	17aa 502f  GeForce GT 720M
+		17aa 5030  GeForce 705M
+		17aa 5031  GeForce 705M
+		17aa 5032  GeForce 820M
+		17aa 5033  GeForce 820M
    	17aa 503e  GeForce 710M
    	17aa 503f  GeForce 820M
+		17aa 5040  GeForce 820M
    	1854 0177  GeForce 710M
    	1854 0180  GeForce 710M
    	1854 0190  GeForce GT 720M
    	1854 0192  GeForce GT 720M
    	1b0a 20dd  GeForce GT 620M
    	1b0a 20df  GeForce GT 620M
+		1b0a 210e  GeForce 820M
    	1b0a 2202  GeForce GT 720M
+		1b0a 90d7  GeForce 820M
+		1b0a 90dd  GeForce 820M
    1180  GK104 [GeForce GTX 680]
    	1043 83f1  GTX680-DC2-2GD5
    	3842 3682  GeForce GTX 680 Mac Edition
@@ -9225,7 +9947,9 @@
    	10de 101d  GRID K200
    118e  GK104 [GeForce GTX 760 OEM]
    118f  GK104GL [Tesla K10]
+	1191  GK104 [GeForce GTX 760 Rev. 2]
    1193  GK104 [GeForce GTX 760 Ti OEM]
+	1194  GK104GL [Tesla K8]
    1195  GK104 [GeForce GTX 660 Rev. 2]
    1198  GK104M [GeForce GTX 880M]
    1199  GK104M [GeForce GTX 870M]
@@ -9244,6 +9968,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]
@@ -9323,6 +10048,8 @@
    1282  GK208 [GeForce GT 640 Rev. 2]
    1284  GK208 [GeForce GT 630 Rev. 2]
    1286  GK208 [GeForce GT 720]
+	1287  GK208 [GeForce GT 730]
+	1288  GK208 [GeForce GT 720]
    1290  GK208M [GeForce GT 730M]
    	103c 2afa  GeForce GT 730A
    	103c 2b04  GeForce GT 730A
@@ -9335,25 +10062,56 @@
    1293  GK208M [GeForce GT 730M]
    1294  GK208M [GeForce GT 740M]
    1295  GK208M [GeForce 710M]
+		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]
    1298  GK208M [GeForce GT 720M]
+	1299  GK208M [GeForce 920M]
    12a0  GK208
    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
    	17aa 369c  GeForce 840A
+	1346  GM108M [GeForce 930M]
+	1347  GM108M [GeForce 940M]
    1380  GM107 [GeForce GTX 750 Ti]
    1381  GM107 [GeForce GTX 750]
    1382  GM107 [GeForce GTX 745]
+	1389  GM107GL [GRID M30]
    1390  GM107M [GeForce 845M]
    1391  GM107M [GeForce GTX 850M]
    	17aa 3697  GeForce GTX 850A
    	17aa a125  GeForce GTX 850A
    1392  GM107M [GeForce GTX 860M]
    1393  GM107M [GeForce 840M]
+	1398  GM107M [GeForce 845M]
+	139a  GM107M [GeForce GTX 950M]
+	139b  GM107M [GeForce GTX 960M]
+	139c  GM107M [GeForce 940M]
+	13b0  GM107GLM [N16P-Q3]
+	13b3  GM107GLM [Quadro K2200M]
+	13ba  GM107GL [Quadro K2200]
+	13bb  GM107GL [Quadro K620]
+	13bc  GM107GL [Quadro K1200]
+	13bd  GM107GL [GRID M40]
+	13c0  GM204 [GeForce GTX 980]
+		1043 8504  GTX980-4GD5
+	13c1  GM204
+	13c2  GM204 [GeForce GTX 970]
+	13c3  GM204
+	13d7  GM204M [GeForce GTX 980M]
+	13d8  GM204M [GeForce GTX 970M]
+	13d9  GM204M [GeForce GTX 965M]
+	1401  GM206 [GeForce GTX 960]
+	17f0  GM200GL [Quadro M6000]
 10df  Emulex Corporation
    0720  OneConnect NIC (Skyhawk)
    	17aa 1056  ThinkServer OCm14102-UX-L AnyFabric
@@ -9481,6 +10239,7 @@
    8406  PCIcanx/PCIcan CAN interface [Kvaser AB]
    8407  PCIcan II CAN interface (A1021, PCB-07, PCB-08) [Kvaser AB]
    8851  S5933 on Innes Corp FM Radio Capture card
+	e004  X-Gene PCIe bridge
 10e9  Alps Electric Co., Ltd.
 10ea  Integraphics
    1680  IGA-1680
@@ -9509,6 +10268,8 @@
    5249  RTS5249 PCI Express Card Reader
    	103c 1909  ZBook 15
    5288  RTS5288 PCI Express Card Reader
+	5289  RTL8411 PCI Express Card Reader
+		1043 1457  K55A Laptop
    8029  RTL-8029(AS)
    	10b8 2011  EZ-Card (SMC1208)
    	10ec 8029  RTL-8029(AS)
@@ -9520,9 +10281,10 @@
    	10ec 8129  RT8129 Fast Ethernet Adapter
    	11ec 8129  RTL8111/8168 PCIe Gigabit Ethernet (misconfigured)
    8136  RTL8101E/RTL8102E PCI Express Fast Ethernet controller
-		103c 2ab1  Pavillion p6774
+		103c 2ab1  Pavilion p6774
    	103c 30cc  Pavilion dv6700
    	1179 ff64  RTL8102E PCI-E Fast Ethernet NIC
+		17c0 1053  AzureWave AW-NE766 802.11B/G/N Mini PCIe Card Model RT2700E
    8138  RT8139 (B/C) Cardbus Fast Ethernet Adapter
    	10ec 8138  RT8139 (B/C) Fast Ethernet Adapter
    8139  RTL-8100/8101L/8139 PCI Fast Ethernet Adapter
@@ -9593,7 +10355,7 @@
    	1043 82c6  M3A78-EH Motherboard
    	1043 83a3  M4A785TD Motherboard
    	1043 8432  P8P67 and other motherboards
-		1043 8505  P8H77-I Motherboard
+		1043 8505  P8 series motherboard
    	105b 0d7c  D270S/D250S Motherboard
    	10ec 8168  RTL8111/8168 PCI Express Gigabit Ethernet controller
    	1458 e000  Motherboard
@@ -9767,6 +10529,7 @@
    	1102 0018  SB1040
    000b  EMU20k2 [X-Fi Titanium Series]
    	1102 0041  SB0880 [SoundBlaster X-Fi Titanium PCI-e]
+	0012  SB Recon3D
    4001  SB Audigy FireWire Port
    	1102 0010  SB Audigy FireWire Port
    7002  SB Live! Game Port
@@ -9811,6 +10574,8 @@
    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)
+	0645  RocketRAID 644L 4 Port SATA-III Controller (eSATA)
    1720  RocketRAID 1720 (2x SATA II RAID Controller)
    1740  RocketRAID 1740
    1742  RocketRAID 1742
@@ -9946,6 +10711,12 @@
    	1458 0691  VT82C691 Apollo Pro System Controller
    0693  VT82C693 [Apollo Pro Plus]
    0698  VT82C693A [Apollo Pro133 AGP]
+	0709  VX11 Standard Host Bridge
+	070a  VX11 PCI Express Root Port
+	070b  VX11 PCI Express Root Port
+	070c  VX11 PCI Express Root Port
+	070d  VX11 PCI Express Root Port
+	070e  VX11 PCI Express Root Port
    0926  VT82C926 [Amazon]
    1000  VT82C570MV
    1106  VT82C570MV
@@ -10201,6 +10972,14 @@
    	1458 5000  GA-7VAX Mainboard
 # probably all K7VT2/4*/6
    	1849 3189  K7VT series Motherboards
+	31b0  VX11 Standard Host Bridge
+	31b1  VX11 Standard Host Bridge
+	31b2  VX11 DRAM Controller
+	31b3  VX11 Power Management Controller
+	31b4  VX11 I/O APIC
+	31b5  VX11 Scratch Device
+	31b7  VX11 Standard Host Bridge
+	31b8  VX11 PCI to PCI Bridge
    3204  K8M800 Host Bridge
    3205  VT8378 [KM400/A] Chipset Host Bridge
    	1458 5000  GA-7VM400M Motherboard
@@ -10253,6 +11032,9 @@
    3410  VX900 DRAM Bus Control
    	19da a179  ZBOX nano VD01
    3432  VL80x xHCI USB 3.0 Controller
+	3456  VX11 Standard Host Bridge
+	345b  VX11 Miscellaneous Bus
+	3a01  VX11 Graphics [Chrome 645/640]
    4149  VIA VT6420 (ATA133) Controller
    4204  K8M800 Host Bridge
    4208  PT890 Host Bridge
@@ -10353,6 +11135,9 @@
    8d01  PN133/PN133T [S3 Twister]
    8d04  KM266/P4M266/P4M266A/P4N266 [S3 ProSavageDDR]
    9001  VX900 Serial ATA Controller
+	9082  Standard AHCI 1.0 SATA Controller
+	9140  HDMI Audio Device
+	9201  USB3.0 Controller
    9530  Secure Digital Memory Card Controller
    95d0  SDIO Host Controller
    a208  PT890 PCI to PCI Bridge Controller
@@ -10396,6 +11181,7 @@
    e238  K8T890 PCI to PCI Bridge Controller
    e340  PT900 PCI to PCI Bridge Controller
    e353  VX800/VX820 PCI Express Root Port
+	e410  VX900 PCI Express Physical Layer Electrical Sub-block
    f208  PT890 PCI to PCI Bridge Controller
    f238  K8T890 PCI to PCI Bridge Controller
    f340  PT900 PCI to PCI Bridge Controller
@@ -10637,6 +11423,14 @@
    806c  PES16T4A/4T4G2 PCI Express Gen2 Switch
    806e  PES24T6G2 PCI Express Gen2 Switch
    806f  HIO524G2 PCI Express Gen2 Switch
+	8088  PES32NT8BG2 PCI Express Switch
+		1093 752f  PXIe-8383mc Device
+		1093 7543  PXIe-8383mc System Host
+		1093 755c  PXIe-8364
+		1093 755d  PXIe-8374
+		1093 75ff  PXIe-8383mc DMA
+		1093 7600  PXIe-8383mc DMA
+		1093 7602  PXIe-8384
 111e  Eldec
 111f  Precision Digital Images
    4a47  Precision MX Video engine interface
@@ -10863,10 +11657,13 @@
    	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
+# http://www.knc1.com/gb.htm
+		1894 0054  TV-Station DVB-S
    7160  SAA7160
    	1458 9009  E8000 DVB-T/Analog TV/FM tuner
    	1461 1455  AVerTV Hybrid Speedy PCI-E (H788)
@@ -10891,6 +11688,7 @@
    	0070 8993  WinTV HVR-2200
    	0070 89a0  WinTV HVR-2200
    	0070 89a1  WinTV HVR-2200
+		0070 f123  WinTV HVR-2205
    7231  SAA7231
    	5ace 8000  Behold TV H8
    	5ace 8001  Behold TV H8
@@ -11008,12 +11806,22 @@
 1137  Cisco Systems Inc
    0023  VIC 81 PCIe Upstream Port
    0040  VIC PCIe Upstream Port
+		1137 004f  VIC 1280 Dual 40Gb Mezzanine
+		1137 0084  VIC 1240 Dual 40Gb MLOM
+		1137 0085  VIC 1225 Dual 10Gb SFP+ PCIe
+		1137 00cd  VIC 1285 Dual 40Gb QSFP+ PCIe
+		1137 00ce  VIC 1225T Dual 10GBaseT PCIe
+		1137 012a  VIC M4308 Dual 40Gb
+		1137 012c  VIC 1340 Dual 40Gb MLOM
+		1137 012e  VIC 1227 Dual 10Gb SFP+ PCIe
+		1137 0137  VIC 1380 Dual 40Gb Mezzanine
    0041  VIC PCIe Downstream Port
    0042  VIC Management Controller
    	1137 0047  VIC P81E PCIe Management Controller
    	1137 0085  VIC 1225 PCIe Management Controller
    	1137 00cd  VIC 1285 PCIe Management Controller
    	1137 00ce  VIC 1225T PCIe Management Controller
+		1137 012e  VIC 1227 PCIe Management Controller
    0043  VIC Ethernet NIC
    	1137 0047  VIC P81E PCIe Ethernet NIC
    	1137 0048  VIC M81KR Mezzanine Ethernet NIC
@@ -11022,6 +11830,10 @@
    	1137 0085  VIC 1225 PCIe Ethernet NIC
    	1137 00cd  VIC 1285 PCIe Ethernet NIC
    	1137 00ce  VIC 1225T PCIe Ethernet NIC
+		1137 012a  VIC M4308 Ethernet NIC
+		1137 012c  VIC 1340 MLOM Ethernet NIC
+		1137 012e  VIC 1227 PCIe Ethernet NIC
+		1137 0137  VIC 1380 Mezzanine Ethernet NIC
    0044  VIC Ethernet NIC Dynamic
    	1137 0047  VIC P81E PCIe Ethernet NIC Dynamic
    	1137 0048  VIC M81KR Mezzanine Ethernet NIC Dynamic
@@ -11030,6 +11842,10 @@
    	1137 0085  VIC 1225 PCIe Ethernet NIC Dynamic
    	1137 00cd  VIC 1285 PCIe Ethernet NIC Dynamic
    	1137 00ce  VIC 1225T PCIe Ethernet NIC Dynamic
+		1137 012a  VIC M4308 Ethernet NIC Dynamic
+		1137 012c  VIC 1340 MLOM Ethernet NIC Dynamic
+		1137 012e  VIC 1227 PCIe Ethernet NIC Dynamic
+		1137 0137  VIC 1380 Mezzanine Ethernet NIC Dynamic
    0045  VIC FCoE HBA
    	1137 0047  VIC P81E PCIe FCoE HBA
    	1137 0048  VIC M81KR Mezzanine FCoE HBA
@@ -11038,9 +11854,28 @@
    	1137 0085  VIC 1225 PCIe FCoE HBA
    	1137 00cd  VIC 1285 PCIe FCoE HBA
    	1137 00ce  VIC 1225T PCIe FCoE HBA
+		1137 012a  VIC M4308 FCoE HBA
+		1137 012c  VIC 1340 MLOM FCoE HBA
+		1137 012e  VIC 1227 PCIe FCoE HBA
+		1137 0137  VIC 1380 Mezzanine FCoE HBA
+	0046  VIC SCSI Controller
+		1137 012a  VIC M4308 SCSI Controller
    004e  VIC 82 PCIe Upstream Port
    0071  VIC SR-IOV VF
+	007a  VIC 1300 PCIe Upstream Port
+		1137 012a  VIC M4308 Dual 40Gb
+		1137 012c  VIC 1340 Dual 40Gb MLOM
+		1137 0137  VIC 1380 Dual 40Gb Mezzanine
    00cf  VIC Userspace NIC
+		1137 004f  VIC 1280 Mezzanine Userspace NIC
+		1137 0084  VIC 1240 MLOM Userspace NIC
+		1137 0085  VIC 1225 PCIe Userspace NIC
+		1137 00cd  VIC 1285 PCIe Userspace NIC
+		1137 00ce  VIC 1225T PCIe Userspace NIC
+		1137 012a  VIC M4308 Userspace NIC
+		1137 012c  VIC 1340 MLOM Userspace NIC
+		1137 012e  VIC 1227 PCIe Userspace NIC
+		1137 0137  VIC 1380 Mezzanine Userspace NIC
 1138  Ziatech Corporation
    8905  8905 [STD 32 Bridge]
 1139  Dynamic Pictures, Inc
@@ -11436,13 +12271,18 @@
 117a  A-Trend Technology
 117b  L G Electronics, Inc.
 117c  ATTO Technology, Inc.
-	002c  SAS RAID Adapter
+	002c  ExpressSAS R380
+	002d  ExpressSAS R348
    0030  Ultra320 SCSI Host Adapter
    	117c 8013  ExpressPCI UL4D
    	117c 8014  ExpressPCI UL4S
    	117c 8027  ExpressPCI UL5D
    	117c 802f  ExpressPCI UL5D Low Profile
    0033  SAS Adapter
+	0041  ExpressSAS R30F
+	8013  ExpressPCI UL4D
+	8014  ExpressPCI UL4S
+	8027  ExpressPCI UL5D
 117d  Becton & Dickinson
 117e  T/R Systems
 117f  Integrated Circuit Systems
@@ -11793,6 +12633,7 @@
    4353  88E8039 PCI-E Fast Ethernet Controller
    	104d 902d  VAIO VGN-NR120E
    4354  88E8040 PCI-E Fast Ethernet Controller
+		144d c06a  R730 Laptop
    	144d c072  Notebook N150P
    4355  88E8040T PCI-E Fast Ethernet Controller
    	1179 ff50  Satellite P305D-S8995E
@@ -11906,6 +12747,8 @@
    	16b8 434b  Tempo SATA E4P
    7810  MV78100 [Discovery Innovation] ARM SoC
    7820  MV78200 [Discovery Innovation] ARM SoC
+	7823  MV78230 [Armada XP] ARM SoC
+	7846  88F6820 [Armada 385] ARM SoC
    f003  GT-64010 Primary Image Piranha Image Generator
 11ac  Canon Information Systems Research Aust.
 11ad  Lite-On Communications Inc
@@ -11927,6 +12770,7 @@
    0002  V300PSC
    0292  V292PBC [Am29030/40 Bridge]
    0960  V96xPBC
+	880a  Deltacast Delta-HD-22
    c960  V96DPC
 11b1  Apricot Computers
 11b2  Eastman Kodak
@@ -12301,6 +13145,7 @@
 1216  Purup Prepress A/S
 1217  O2 Micro, Inc.
    00f7  Firewire (IEEE 1394)
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	1179 ff50  Satellite P305D-S8995E
    10f7  1394 OHCI Compliant Host Controller
    11f7  OZ600 1394a-2000 Controller
@@ -12327,8 +13172,10 @@
    	1025 0035  TravelMate 660
    7114  OZ711M1/MC1 4-in-1 MemoryCardBus Controller
    7120  Integrated MMC/SD Controller
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	1179 ff50  Satellite P305D-S8995E
    7130  Integrated MS/xD Controller
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	1179 ff50  Satellite P305D-S8995E
    7134  OZ711MP1/MS1 MemoryCardBus Controller
    7135  Cardbus bridge
@@ -12343,9 +13190,11 @@
    7233  OZ711MP3/MS3 4-in-1 MemoryCardBus Controller
    8120  Integrated MMC/SD Controller
    8130  Integrated MS/MSPRO/xD Controller
-	8320  OZ600 MMC/SD Controller
+	8220  OZ600FJ1/OZ900FJ1 SD/MMC Card Reader Controller
+	8221  OZ600FJ0/OZ900FJ0/OZ600FJS SD/MMC Card Reader Controller
+	8320  OZ600RJ1/OZ900RJ1 SD/MMC Card Reader Controller
    	1028 04a3  Precision M4600
-	8321  Integrated MMC/SD controller
+	8321  OZ600RJ0/OZ900RJ0/OZ600RJS SD/MMC Card Reader Controller
    8330  OZ600 MS/xD Controller
    	1028 04a3  Precision M4600
    8331  O2 Flash Memory Card
@@ -13521,6 +14370,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
@@ -13921,6 +14772,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
@@ -14227,7 +15079,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
@@ -14251,7 +15103,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
@@ -14275,7 +15127,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
@@ -14299,7 +15151,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
@@ -14323,35 +15175,35 @@
    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
    4788  T440-4088 Unified Wire Ethernet Controller
-	4801  T420-CR Unified Wire Ethernet Controller
-	4802  T422-CR Unified Wire Ethernet Controller
-	4803  T440-CR Unified Wire Ethernet Controller
-	4804  T420-BCH Unified Wire Ethernet Controller
-	4805  T440-BCH Unified Wire Ethernet Controller
-	4806  T440-CH Unified Wire Ethernet Controller
-	4807  T420-SO Unified Wire Ethernet Controller
-	4808  T420-CX Unified Wire Ethernet Controller
-	4809  T420-BT Unified Wire Ethernet Controller
-	480a  T404-BT Unified Wire Ethernet Controller
-	480b  B420-SR Unified Wire Ethernet Controller
-	480c  B404-BT Unified Wire Ethernet Controller
-	480d  T480 Unified Wire Ethernet Controller
-	480e  T440-LP-CR Unified Wire Ethernet Controller
-	480f  T440 [Amsterdam] Unified Wire Ethernet Controller
-	4880  T480-4080 T480 Unified Wire Ethernet Controller
-	4881  T440F-4081 T440-FCoE Unified Wire Ethernet Controller
-	4882  T420-4082  Unified Wire Ethernet Controller
-	4883  T420X-4083 Unified Wire Ethernet Controller
-	4884  T420-4084 Unified Wire Ethernet Controller
-	4885  T420-4085 SFP+ Unified Wire Ethernet Controller
-	4886  T440-4086 10Gbase-T Unified Wire Ethernet Controller
-	4887  T440T-4087 Unified Wire Ethernet Controller
-	4888  T440-4088 Unified Wire Ethernet Controller
+	4801  T420-CR Unified Wire Ethernet Controller [VF]
+	4802  T422-CR Unified Wire Ethernet Controller [VF]
+	4803  T440-CR Unified Wire Ethernet Controller [VF]
+	4804  T420-BCH Unified Wire Ethernet Controller [VF]
+	4805  T440-BCH Unified Wire Ethernet Controller [VF]
+	4806  T440-CH Unified Wire Ethernet Controller [VF]
+	4807  T420-SO Unified Wire Ethernet Controller [VF]
+	4808  T420-CX Unified Wire Ethernet Controller [VF]
+	4809  T420-BT Unified Wire Ethernet Controller [VF]
+	480a  T404-BT Unified Wire Ethernet Controller [VF]
+	480b  B420-SR Unified Wire Ethernet Controller [VF]
+	480c  B404-BT Unified Wire Ethernet Controller [VF]
+	480d  T480 Unified Wire Ethernet Controller [VF]
+	480e  T440-LP-CR Unified Wire Ethernet Controller [VF]
+	480f  T440 [Amsterdam] Unified Wire Ethernet Controller [VF]
+	4880  T480-4080 T480 Unified Wire Ethernet Controller [VF]
+	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  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]
+	4888  T440-4088 Unified Wire Ethernet Controller [VF]
    5001  T520-CR Unified Wire Ethernet Controller
    5002  T522-CR Unified Wire Ethernet Controller
    5003  T540-CR Unified Wire Ethernet Controller
@@ -14370,14 +15222,19 @@
    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
    5081  T540-5081 Unified Wire Ethernet Controller
+	5082  T504-5082 Unified Wire Ethernet Controller
    5083  T540-5083 Unified Wire Ethernet Controller
    5084  T580-5084 Unified Wire Ethernet Controller
    5085  T580-5085 Unified Wire Ethernet Controller
+	5086  T580-5086 Unified Wire Ethernet Controller
+	5087  T580-5087 Unified Wire Ethernet Controller
+	5088  T570-5088 Unified Wire Ethernet Controller
+	5089  T520-5089 Unified Wire Ethernet Controller
    5401  T520-CR Unified Wire Ethernet Controller
    5402  T522-CR Unified Wire Ethernet Controller
    5403  T540-CR Unified Wire Ethernet Controller
@@ -14396,14 +15253,19 @@
    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
    5481  T540-5081 Unified Wire Ethernet Controller
+	5482  T504-5082 Unified Wire Ethernet Controller
    5483  T540-5083 Unified Wire Ethernet Controller
    5484  T580-5084 Unified Wire Ethernet Controller
    5485  T580-5085 Unified Wire Ethernet Controller
+	5486  T580-5086 Unified Wire Ethernet Controller
+	5487  T580-5087 Unified Wire Ethernet Controller
+	5488  T570-5088 Unified Wire Ethernet Controller
+	5489  T520-5089 Unified Wire Ethernet Controller
    5501  T520-CR Unified Wire Storage Controller
    5502  T522-CR Unified Wire Storage Controller
    5503  T540-CR Unified Wire Storage Controller
@@ -14422,14 +15284,19 @@
    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
    5581  T540-5081 Unified Wire Storage Controller
+	5582  T504-5082 Unified Wire Storage Controller
    5583  T540-5083 Unified Wire Storage Controller
    5584  T580-5084 Unified Wire Storage Controller
    5585  T580-5085 Unified Wire Storage Controller
+	5586  T580-5086 Unified Wire Storage Controller
+	5587  T580-5087 Unified Wire Storage Controller
+	5588  T570-5088 Unified Wire Storage Controller
+	5589  T520-5089 Unified Wire Storage Controller
    5601  T520-CR Unified Wire Storage Controller
    5602  T522-CR Unified Wire Storage Controller
    5603  T540-CR Unified Wire Storage Controller
@@ -14448,14 +15315,19 @@
    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
    5681  T540-5081 Unified Wire Storage Controller
+	5682  T504-5082 Unified Wire Storage Controller
    5683  T540-5083 Unified Wire Storage Controller
    5684  T580-5084 Unified Wire Storage Controller
    5685  T580-5085 Unified Wire Storage Controller
+	5686  T580-5086 Unified Wire Storage Controller
+	5687  T580-5087 Unified Wire Storage Controller
+	5688  T570-5088 Unified Wire Storage Controller
+	5689  T520-5089 Unified Wire Storage Controller
    5701  T520-CR Unified Wire Ethernet Controller
    5702  T522-CR Unified Wire Ethernet Controller
    5703  T540-CR Unified Wire Ethernet Controller
@@ -14479,35 +15351,45 @@
    5715  T502-BT Unified Wire Ethernet Controller
    5780  T540-5080 Unified Wire Ethernet Controller
    5781  T540-5081 Unified Wire Ethernet Controller
+	5782  T504-5082 Unified Wire Ethernet Controller
    5783  T540-5083 Unified Wire Ethernet Controller
    5784  T580-5084 Unified Wire Ethernet Controller
    5785  T580-5085 Unified Wire Ethernet Controller
-	5801  T520-CR Unified Wire Ethernet Controller
-	5802  T522-CR Unified Wire Ethernet Controller
-	5803  T540-CR Unified Wire Ethernet Controller
-	5804  T520-BCH Unified Wire Ethernet Controller
-	5805  T540-BCH Unified Wire Ethernet Controller
-	5806  T540-CH Unified Wire Ethernet Controller
-	5807  T520-SO Unified Wire Ethernet Controller
-	5808  T520-CX Unified Wire Ethernet Controller
-	5809  T520-BT Unified Wire Ethernet Controller
-	580a  T504-BT Unified Wire Ethernet Controller
-	580b  B520-SR Unified Wire Ethernet Controller
-	580c  B504-BT Unified Wire Ethernet Controller
-	580d  T580-CR Unified Wire Ethernet Controller
-	580e  T540-LP-CR Unified Wire Ethernet Controller
-	580f  T540 [Amsterdam] Unified Wire Ethernet Controller
-	5810  T580-LP-CR Unified Wire Ethernet Controller
-	5811  T520-LL-CR Unified Wire Ethernet Controller
-	5812  T560-CR Unified Wire Ethernet Controller
-	5813  T580-CR Unified Wire Ethernet Controller
-	5814  T580-LP-SO-CR Unified Wire Ethernet Controller
-	5815  T502-BT Unified Wire Ethernet Controller
-	5880  T540-5080 Unified Wire Ethernet Controller
-	5881  T540-5081 Unified Wire Ethernet Controller
-	5883  T540-5083 Unified Wire Ethernet Controller
-	5884  T580-5084 Unified Wire Ethernet Controller
-	5885  T580-5085 Unified Wire Ethernet Controller
+	5786  T580-5086 Unified Wire Ethernet Controller
+	5787  T580-5087 Unified Wire Ethernet Controller
+	5788  T570-5088 Unified Wire Ethernet Controller
+	5789  T520-5089 Unified Wire Ethernet Controller
+	5801  T520-CR Unified Wire Ethernet Controller [VF]
+	5802  T522-CR Unified Wire Ethernet Controller [VF]
+	5803  T540-CR Unified Wire Ethernet Controller [VF]
+	5804  T520-BCH Unified Wire Ethernet Controller [VF]
+	5805  T540-BCH Unified Wire Ethernet Controller [VF]
+	5806  T540-CH Unified Wire Ethernet Controller [VF]
+	5807  T520-SO Unified Wire Ethernet Controller [VF]
+	5808  T520-CX Unified Wire Ethernet Controller [VF]
+	5809  T520-BT Unified Wire Ethernet Controller [VF]
+	580a  T504-BT Unified Wire Ethernet Controller [VF]
+	580b  B520-SR Unified Wire Ethernet Controller [VF]
+	580c  B504-BT Unified Wire Ethernet Controller [VF]
+	580d  T580-CR Unified Wire Ethernet Controller [VF]
+	580e  T540-LP-CR Unified Wire Ethernet Controller [VF]
+	580f  T540 [Amsterdam] Unified Wire Ethernet Controller [VF]
+	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-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]
+	5881  T540-5081 Unified Wire Ethernet Controller [VF]
+	5882  T504-5082 Unified Wire Ethernet Controller [VF]
+	5883  T540-5083 Unified Wire Ethernet Controller [VF]
+	5884  T580-5084 Unified Wire Ethernet Controller [VF]
+	5885  T580-5085 Unified Wire Ethernet Controller [VF]
+	5886  T580-5086 Unified Wire Ethernet Controller [VF]
+	5887  T580-5087 Unified Wire Ethernet Controller [VF]
+	5888  T570-5088 Unified Wire Ethernet Controller [VF]
+	5889  T520-5089 Unified Wire Ethernet Controller [VF]
    a000  PE10K Unified Wire Ethernet Controller
 1426  Storage Technology Corp.
 1427  Better On-Line Solutions
@@ -14660,6 +15542,7 @@
    1003  HCF 56k Data/Fax Modem
 148e  OSI Plus Corporation
 148f  Plant Equipment, Inc.
+	5370  Dexlink AUWL15I1
 1490  Stone Microsystems PTY Ltd.
 1491  ZEAL Corporation
 1492  Time Logic Corporation
@@ -14754,6 +15637,8 @@
 14c2  DTK Computer
 14c3  MEDIATEK Corp.
    7630  MT7630e 802.11bgn Wireless Network Adapter
+# MT7612E too?
+	7662  MT7662E 802.11ac PCI Express Wireless Network Adapter
 14c4  IWASAKI Information Systems Co Ltd
 14c5  Automation Products AB
 14c6  Data Race Inc
@@ -14837,6 +15722,7 @@
    080f  Sentry5 DDR/SDR RAM Controller
    0811  Sentry5 External Interface Core
    0816  BCM3302 Sentry5 MIPS32 CPU
+	1570  720p FaceTime HD Camera
    1600  NetXtreme BCM5752 Gigabit Ethernet PCI Express
    	1028 01c1  Precision 490
    	1028 01c2  Latitude D620
@@ -14977,6 +15863,7 @@
    1655  NetXtreme BCM5717 Gigabit Ethernet PCIe
    1656  NetXtreme BCM5718 Gigabit Ethernet PCIe
    1657  NetXtreme BCM5719 Gigabit Ethernet PCIe
+		103c 169d  Ethernet 1Gb 4-port 331FLR Adapter
    1659  NetXtreme BCM5721 Gigabit Ethernet PCI Express
    	1014 02c6  eServer xSeries server mainboard
    	1028 01e6  PowerEdge 860
@@ -15106,6 +15993,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
@@ -15381,6 +16269,7 @@
    4333  Serial (EDGE/GPRS modem part of Option GT Combo Edge)
    4344  EDGE/GPRS data and 802.11b/g combo cardbus [GC89]
    4350  BCM43222 Wireless Network Adapter
+	4351  BCM43222 802.11abgn Wireless Network Adapter
    4353  BCM43224 802.11a/b/g/n
    	1028 000e  Wireless 1520 Half-size Mini PCIe Card
    	103c 1509  WMIB-275N Half-size Mini PCIe Card
@@ -15393,10 +16282,22 @@
    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
+	43a1  BCM4360 802.11ac Wireless Network Adapter
+	43a2  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
+	43ba  BCM43602 802.11ac Wireless LAN SoC
+	43bb  BCM43602 802.11ac Wireless LAN SoC
+	43bc  BCM43602 802.11ac Wireless LAN SoC
+	43d3  BCM43567 802.11ac Wireless Network Adapter
+	43d9  BCM43570 802.11ac Wireless Network Adapter
+	43df  BCM4354 802.11ac Wireless LAN SoC
+	43ec  BCM4356 802.11ac Wireless Network Adapter
    4401  BCM4401 100Base-T
    	1025 0035  TravelMate 660
    	103c 08b0  tc1100 tablet
@@ -15558,6 +16459,8 @@
    1815  HCF 56k Modem
    	0e11 0022  Grizzly
    	0e11 0042  Yogi
+# Integrated in CX86111/CX86113 processors
+	1830  CX861xx Integrated Host Bridge
    2003  HSF 56k Data/Fax Modem
    2004  HSF 56k Data/Fax/Voice Modem
    2005  HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem
@@ -15643,6 +16546,7 @@
    	0070 9600  WinTV 88x Video
    	0070 9802  WinTV-HVR1100 DVB-T/Hybrid (Low Profile)
    	1002 00f8  ATI TV Wonder Pro
+		1002 00f9  ATI TV Wonder
    	1002 a101  HDTV Wonder
    	1043 4823  ASUS PVR-416
    	107d 6611  Winfast TV 2000XP Expert
@@ -15722,11 +16626,18 @@
    	18ac db00  DVICO FusionHDTV DVB-T1
    	5654 2388  GoTView PCI Hybrid Audio Capture Device
    8852  CX23885 PCI Video and Audio Decoder
-		0070 8010  Hauppauge WinTV HVR-1400 ExpressCard
+		0070 8010  WinTV HVR-1400 ExpressCard
+		0070 f038  WinTV HVR-5525
    	107d 6f22  WinFast PxTV1200
+		13c2 3013  TT-budget CT2-4500 CI
    	1461 c039  AVerTV Hybrid Express (A577)
    	153b 117e  Cinergy T PCIe Dual
    	18ac db78  FusionHDTV DVB-T Dual Express
+		4254 0950  S950
+		4254 0952  S952
+		4254 0982  T982
+		4254 9580  T9580
+		4254 980c  T980C
    8880  CX23887/8 PCIe Broadcast Audio and Video Decoder with 3D Comb
    	0070 c108  WinTV-HVR-4400-HD model 1278
    	5654 2389  GoTView X5 DVD Hybrid PCI-E
@@ -15910,6 +16821,11 @@
 1541  MACHONE Communications
 1542  Concurrent Computer Corporation
    9260  RCIM-II Real-Time Clock & Interrupt Module
+	9271  RCIM-III Real-Time Clock & Interrupt Module (PCIe)
+	9272  Pulse Width Modulator Card
+	9277  5 Volt Delta Sigma Converter Card
+	9278  10 Volt Delta Sigma Converter Card
+	9287  Analog Output Card
 1543  SILICON Laboratories
    3052  Intel 537 [Winmodem]
    4c22  Si3036 MC'97 DAA
@@ -16063,7 +16979,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
@@ -16080,13 +16997,16 @@
    0191  MT25408 [ConnectX IB Flash Recovery]
    01f6  MT27500 Family [ConnectX-3 Flash Recovery]
    01ff  MT27600 Family [Connect-IB Flash Recovery]
+	0209  MT27700 Family [ConnectX-4 Flash Recovery]
    1002  MT25400 Family [ConnectX-2 Virtual Function]
    1003  MT27500 Family [ConnectX-3]
-	1004  MT27500 Family [ConnectX-3 Virtual Function]
+		103c 1777  InfiniBand FDR/EN 10/40Gb Dual Port 544FLR-QSFP Adapter (Rev Cx)
+		103c 17c9  Infiniband QDR/Ethernet 10Gb 2-port 544i Adapter
+		103c 18d6  InfiniBand FDR/EN 10/40Gb Dual Port 544QSFP Adapter
+	1004  MT27500/MT27520 Family [ConnectX-3/ConnectX-3 Pro Virtual Function]
    1005  MT27510 Family
    1006  MT27511 Family
    1007  MT27520 Family [ConnectX-3 Pro]
-	1008  MT27520 Family [ConnectX-3 Pro Virtual Function]
    1009  MT27530 Family
    100a  MT27531 Family
    100b  MT27540 Family
@@ -16097,8 +17017,8 @@
    1010  MT27561 Family
    1011  MT27600 [Connect-IB]
    1012  MT27600 Family [Connect-IB Virtual Function]
-	1013  MT27620 Family
-	1014  MT27621 Family
+	1013  MT27700 Family [ConnectX-4]
+	1014  MT27700 Family [ConnectX-4 Virtual Function]
    1015  MT27630 Family
    1016  MT27631 Family
    1017  MT27640 Family
@@ -16554,6 +17474,7 @@
    	103c 3040  U98Z062.12 802.11bgn Wireless Half-size Mini PCIe Card
    	105b e017  T77H126.00 802.11bgn Wireless Half-size Mini PCIe Card
    	105b e023  T77H121.04 802.11bgn Wireless Half-size Mini PCIe Card
+		105b e025  T77H121.05 802.11bgn Wireless Half-size Mini PCIe Card
    	1113 e811  WN7811A (Toshiba PA3722U-1MPC) 802.11bgn Wireless Half-size Mini PCIe Card
    	185f 30af  DNXA-95 802.11bgn Wireless Half-size Mini PCIe Card
    	1931 0023  Option GTM67x PCIe WiFi Adapter
@@ -16564,6 +17485,7 @@
    002c  AR2427 802.11bg Wireless Network Adapter (PCI-Express)
    002d  AR9227 Wireless Network Adapter
    002e  AR9287 Wireless Network Adapter (PCI-Express)
+		105b e034  T77H167.00
    0030  AR93xx Wireless Network Adapter
    	103c 1627  AR9380/HB112 802.11abgn 3×3 Wi-Fi Adapter
    	106b 009a  AirPort Extreme
@@ -16572,6 +17494,7 @@
    	1a56 2001  Killer Wireless-N 1103 Half-size Mini PCIe Card [AR9380]
    0032  AR9485 Wireless Network Adapter
    	103c 1838  AR9485/HB125 802.11bgn 1×1 Wi-Fi Adapter
+		105b e044  Unex DHXA-225
    0033  AR9580 Wireless Network Adapter
    0034  AR9462 Wireless Network Adapter
    	1a56 2003  Killer Wireless-N 1202 Half-size Mini PCIe Card
@@ -16580,6 +17503,8 @@
 # Also used as Gigabyte GC-WB150 on a PCIe-to-mini-PCIe converter
    	1a3b 2100  AW-NB100H 802.11n Wireless Mini PCIe Card
    003c  QCA988x 802.11ac Wireless Network Adapter
+# all QCA6174 devices?
+	003e  Killer N1525 Wireless-AC
    0207  AR5210 Wireless Network Adapter [AR5000 802.11a]
    1014  AR5212 802.11abg NIC
    	1014 058a  ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6)
@@ -16610,6 +17535,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
@@ -16686,6 +17612,12 @@
    6302  XMC Module with user-configurable Virtex-6 FPGA, 365k logic cells, SFP front I/O
    6303  XMC Module with user-configurable Virtex-6 FPGA, 240k logic cells, no front I/O
    6304  XMC Module with user-configurable Virtex-6 FPGA, 365k logic cells, no front I/O
+	7000  XMC-7K325F: User-configurable Kintex-7 FPGA, 325k logic cells plus SFP front I/O
+	7001  XMC-7K410F: User-configurable Kintex-7 FPGA, 410k logic cells plus SFP front I/O
+	7002  XMC-7K325AX: User-Configurable Kintex-7 FPGA, 325k logic cells with AXM Plug-In I/O
+	7003  XMC-7K410AX: User-Configurable Kintex-7 FPGA, 410k logic cells with AXM Plug-In I/O
+	7004  XMC-7K325CC: User-Configurable Kintex-7 FPGA, 325k logic cells, conduction-cooled
+	7005  XMC-7K410CC: User-Configurable Kintex-7 FPGA, 410k logic cells, conduction-cooled
 16da  Advantech Co., Ltd.
    0011  INES GPIB-PCI
 16df  PIKA Technologies Inc.
@@ -16704,6 +17636,9 @@
    ab06  USR997901A 10/100 Cardbus NIC
 16ed  Sycron N. V.
    1001  UMIO communication card
+16f2  ETAS GmbH
+	0200  I/O board
+		16f2 0010  ES53xx I/O board
 16f3  Jetway Information Co., Ltd.
 16f4  Vweb Corp
    8000  VW2010
@@ -16751,10 +17686,11 @@
 1760  TEDIA spol. s r. o.
    0101  PCD-7004 Digital Bi-Directional Ports PCI Card
    0102  PCD-7104 Digital Input & Output PCI Card
+	0303  PCD-7006C Digital Input & Output PCI Card
 1771  InnoVISION Multimedia Ltd.
 # nee SBS Technologies
 1775  GE Intelligent Platforms
-177d  Cavium Networks
+177d  Cavium, Inc.
    0001  Nitrox XL N1
    0003  Nitrox XL N1 Lite
    0004  Octeon (and older) FIPS
@@ -16774,6 +17710,53 @@
    0094  Octeon Fusion CNF71XX Cell processor
    0095  Octeon III CN78XX Network Processor
    0096  Octeon III CN70XX Network Processor
+	a001  THUNDERX MRML Bridge
+	a002  THUNDERX PCC Bridge
+		177d a102  CN88XX PCC Bridge
+	a008  THUNDERX SMMU
+		177d a108  CN88XX SMMU
+	a009  THUNDERX Generic Interrupt Controller
+	a00a  THUNDERX GPIO Controller
+	a00b  THUNDERX MPI / SPI Controller
+	a00c  THUNDERX MIO-PTP Controller
+	a00d  THUNDERX MIX Network Controller
+	a00e  THUNDERX Reset Controller
+	a00f  THUNDERX UART Controller
+	a010  THUNDERX eMMC/SD Controller
+	a011  THUNDERX MIO-BOOT Controller
+	a012  THUNDERX TWSI / I2C Controller
+	a013  THUNDERX CCPI (Multi-node connect)
+	a014  THUNDERX Voltage Regulator Module
+	a015  THUNDERX PCIe Switch Logic Interface
+	a016  THUNDERX Key Memory
+	a017  THUNDERX GTI (Global System Timers)
+	a018  THUNDERX Random Number Generator
+	a019  THUNDERX DFA
+	a01a  THUNDERX Zip Coprocessor
+	a01b  THUNDERX xHCI USB Controller
+	a01c  THUNDERX AHCI SATA Controller
+		177d a11c  CN88XX AHCI SATA Controller
+	a01d  THUNDERX RAID Coprocessor
+	a01e  THUNDERX Network Interface Controller
+	a01f  THUNDERX Traffic Network Switch
+	a020  THUNDERX PEM (PCI Express Interface)
+	a021  THUNDERX L2C (Level-2 Cache Controller)
+	a022  THUNDERX LMC (DRAM Controller)
+	a023  THUNDERX OCLA (On-Chip Logic Analyzer)
+	a024  THUNDERX OSM
+	a025  THUNDERX GSER (General Serializer/Deserializer)
+	a026  THUNDERX BGX (Common Ethernet Interface)
+	a027  THUNDERX IOBN
+	a029  THUNDERX NCSI (Network Controller Sideband Interface)
+	a02a  THUNDERX SGP
+	a02b  THUNDERX SMI / MDIO Controller
+	a02c  THUNDERX DAP (Debug Access Port)
+	a02d  THUNDERX PCIERC (PCIe Root Complex)
+	a02e  THUNDERX L2C-TAD
+	a02f  THUNDERX L2C-CBC
+	a030  THUNDERX L2C-MCI
+	a031  THUNDERX MIO-FUS (Fuse Access Controller)
+	a032  THUNDERX FUSF (Fuse Controller)
 1787  Hightech Information System Ltd.
 1789  Ennyah Technologies Corp.
 # also used by Struck Innovative Systeme for joint developments
@@ -16790,6 +17773,7 @@
    0010  PCIe Counter Timer
    0011  SIS1100-e single link
    0012  SIS1100-e quad link
+	0015  SIS8100 [Gigabit link, MicroTCA]
 1797  Techwell Inc.
    6801  TW6802 multimedia video card
    6802  TW6802 multimedia other device
@@ -16932,6 +17916,8 @@
    	1468 0305  T60N871 802.11g Mini PCI Wireless Adapter
    	1737 0029  WPC54G v4 802.11g Wireless-G Notebook Adapter
 17ff  Benq Corporation
+1800  Qualcore Logic Inc.
+	1100  Nanospeed Trading Gateway
 1803  ProdaSafe GmbH
 1805  Euresys S.A.
 1809  Lumanate, Inc.
@@ -16996,6 +17982,7 @@
    0701  RT2760 Wireless 802.11n 1T/2R
    	1737 0074  WMP110 v2 802.11n RangePlus Wireless PCI Adapter
    0781  RT2790 Wireless 802.11n 1T/2R PCIe
+		1814 2790  RT2790 Wireless 802.11n 1T/2R PCIe
    3060  RT3060 Wireless 802.11n 1T/1R
    	1186 3c04  DWA-525 Wireless N 150 Desktop Adapter (rev.A1)
    3062  RT3062 Wireless 802.11n 2T/2R
@@ -17062,8 +18049,9 @@
    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
 1876  L-3 Communications
    a101  VigraWATCH PCI
@@ -17203,6 +18191,8 @@
    0115  NT20E2-PTP Network Adapter 2x10Gb
    0125  NT4E2-4-PTP Network Adapter 4x1Gb
    0135  NT20E2-PTP Network Adapter 2x10Gb
+	0145  NT40E3-4-PTP Network Adapter 4x10Gb
+	0155  NT100E3-1-PTP Network Adapter 1x100Gb
 18f6  NextIO
    1000  [Nexsis] Switch Virtual P2P PCIe Bridge
    1001  [Texsis] Switch Virtual P2P PCIe Bridge
@@ -17350,6 +18340,8 @@
    	1924 800b  SFN7x42Q-R1 Flareon Ultra 7000 Series 10/40G Adapter
    1803  SFC9020 Virtual Function [Solarstorm]
    1813  SFL9021 Virtual Function [Solarstorm]
+	1903  SFC9120 Virtual Function
+	1923  SFC9140 Virtual Function
    6703  SFC4000 rev A iSCSI/Onload [Solarstorm]
    	10b8 0102  SMC10GPCIe-10BT (A2) [TigerCard]
    	10b8 0103  SMC10GPCIe-10BT (A3) [TigerCard]
@@ -17462,6 +18454,14 @@
    0401  P4080
    0408  P4040E
    0409  P4040
+	0440  T4240 with security
+	0441  T4240 without security
+	0446  T4160 with security
+	0447  T4160 without security
+	0830  T2080 with security
+	0831  T2080 without security
+	0838  T2081 with security
+	0839  T2081 without security
    580c  MPC5121e
    7010  MPC8641 PCI Host Bridge
    7011  MPC8641D PCI Host Bridge
@@ -17496,6 +18496,7 @@
    1062  AR8132 Fast Ethernet
    1063  AR8131 Gigabit Ethernet
    	1458 e000  GA-G31M-ES2L Motherboard
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    1066  Attansic L2c Gigabit Ethernet
    1067  Attansic L1c Gigabit Ethernet
    1073  AR8151 v1.0 Gigabit Ethernet
@@ -17641,6 +18642,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
@@ -17648,6 +18650,11 @@
    0005  ETP v1.4
    000a  ETP-104 v1.1
    000e  DSLP-104 v1.1
+# nee Metalink Ltd.
+1a30  Lantiq
+	0680  MtW8171 [Hyperion II]
+	0700  Wave300 PSB8224 [Hyperion III]
+	0710  Wave300 PSB8231 [Hyperion III]
 1a32  Quanta Microsystems, Inc
 1a3b  AzureWave
    1112  AR9285 Wireless Network Adapter (PCI-Express)
@@ -17694,7 +18701,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]
@@ -17702,6 +18709,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
@@ -17742,8 +18750,11 @@
    0200  Wil6200 PCI Express Port
    0201  Wil6200 Wireless PCI Express Port
    0301  Wil6200 802.11ad Wireless Network Adapter
+	0302  Wil6200 802.11ad Wireless Network Adapter
+	0310  Wil6200 802.11ad Wireless Network Adapter
 1aec  Wolfson Microelectronics
-1aed  Fusion-io
+# nee Fusion-io
+1aed  SanDisk
    1003  ioDimm3 (v1.2)
    1005  ioDimm3
    	1014 03c3  High IOPS SSD PCIe Adapter
@@ -17757,6 +18768,9 @@
    1007  ioXtreme Pro
    1008  ioXtreme-2
    2001  ioDrive2
+	3001  ioMemory FHHL
+	3002  ioMemory HHHL
+	3003  ioMemory Mezzanine
 1aee  Caustic Graphics Inc.
 # nee Qumranet, Inc.
 1af4  Red Hat, Inc
@@ -17789,6 +18803,7 @@
    	1849 1042  Motherboard
    1080  ASM1083/1085 PCIe to PCI Bridge
    	1849 1080  Motherboard
+	1142  ASM1042A USB 3.0 Host Controller
 1b2c  Opal-RT Technologies Inc.
 1b36  Red Hat, Inc.
    0001  QEMU PCI-PCI bridge
@@ -17804,6 +18819,9 @@
    	1af4 1100  QEMU Virtual Machine
 1b37  Signal Processing Devices Sweden AB
    0014  ADQ412
+# now owned by HGST (a Western Digital subsidiary)
+1b39  sTec, Inc.
+	0001  S1120 PCIe Accelerator SSD
 1b3a  Westar Display Technologies
    7589  HRED J2000 - JPEG 2000 Video Codec Device
 1b3e  Teradata Corp.
@@ -17837,11 +18855,14 @@
    9480  88SE9480 SAS/SATA 6Gb/s RAID controller
    9485  88SE9485 SAS/SATA 6Gb/s controller
 1b55  NetUP Inc.
+	18f6  Dual DVB Universal CI card
    2a2c  Dual DVB-S2-CI card
    e2e4  Dual DVB-T/C-CI RF card
 # 2xHDMI and 2xHD-SDI inputs
    e5f4  MPEG2 and H264 Encoder-Transcoder
    f1c4  Dual ASI-RX/TX-CI card
+1b66  Deltacast
+	0007  Delta-3G-elp-11 SDI I/O Board
 1b6f  Etron Technology, Inc.
    7023  EJ168 USB 3.0 Host Controller
    7052  EJ188/EJ198 USB 3.0 Host Controller
@@ -17858,6 +18879,7 @@
    d430  D410/430 Quad-port E1/T1 card
 1b85  OCZ Technology Group, Inc.
    1041  RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller)
+	8788  RevoDrive Hybrid
 1b96  Western Digital
 1b9a  XAVi Technologies Corp.
 1bad  ReFLEX CES
@@ -17878,11 +18900,15 @@
 1bbf  Maxeler Technologies Ltd.
    0003  MAX3
    0004  MAX4
+1bee  IXXAT Automation GmbH
+	0003  CAN-IB200/PCIe
 1bf4  VTI Instruments Corporation
    0001  SentinelEX
 1bfd  EeeTOP
 1c1c  Symphony
    0001  82C101
+1c28  Lite-On IT Corp. / Plextor
+	0122  M6e PCI Express SSD [Marvell 88SS9183]
 1c2c  Fiberblaze
    000a  Capture
    000f  SmartNIC
@@ -17902,6 +18928,8 @@
    0300  Telas 2.V
 1c44  Enmotus Inc
    8000  8000 Storage IO Controller
+1c7e  TTTech Computertechnik AG
+	0200  zFAS Debug Port
 1c7f  Elektrobit Austria GmbH
    5100  EB5100
 1c8a  TSF5 Corporation
@@ -17909,10 +18937,17 @@
 1cb1  Collion UG & Co.KG
 1cc5  Embedded Intelligence, Inc.
    0100  CAN-PCIe-02
+1cd2  SesKion GmbH
+	0301  Simulyzer-RT CompactPCI Serial DIO-1 card
 1ce4  Exablaze
    0001  ExaNIC X4
    0002  ExaNIC X2
 1cf7  Subspace Dynamics
+# CEM Solutions Pvt. Ltd.
+1d21  Allo
+1d26  Kalray Inc.
+	0040  Turbocard2 Accelerator
+	e004  AB01/EMB01 Development Board
 1d44  DPT
    a400  PM2x24/PM3224
 1d5c  Fantasia Trading LLC
@@ -18016,6 +19051,10 @@
 3513  ARCOM Control Systems Ltd
 37d9  ITD Firm ltd.
    1138  SCHD-PH-8 Phase detector
+# 12-ch Relay Actuator Card
+	1140  VR-12-PCI
+# multiport serial board
+	1141  PCI-485(422)
 3842  eVga.com. Corp.
 38ef  4Links
 3d3d  3DLabs
@@ -18115,6 +19154,7 @@
 416c  Aladdin Knowledge Systems
    0100  AladdinCARD
    0200  CPC
+4254  DVBSky
 4321  Tata Power Strategic Electronics Division
 434e  CAST Navigation LLC
 4444  Internext Compression Inc
@@ -18465,6 +19505,9 @@
 5700  Netpower
 584d  AuzenTech Co., Ltd.
 5851  Exacq Technologies
+	8008  tDVR8008 8-port video capture card
+	8016  tDVR8016 16-chan video capture card
+	8032  tDVR8032 32-chan video capture card
 5853  XenSource, Inc.
    0001  Xen Platform Device
 # Virtual device surfaced in guests to provide HID events.
@@ -18506,6 +19549,8 @@
    3000  HD-3000
    5500  HD5500 HDTV
 7284  HT OMEGA Inc.
+7401  EndRun Technologies
+	e100  PTP3100 PCIe PTP Slave Clock
 7604  O.N. Electronic Co Ltd.
 7bde  MIDAC Corporation
 7fed  PowerTV
@@ -18526,9 +19571,14 @@
    0044  Core Processor DRAM Controller
    	1025 0347  Aspire 7740G
    	1025 0487  TravelMate 5742
+		144d c06a  R730 Laptop
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    	e4bf 50c1  PC1-GROOVE
    0045  Core Processor PCI Express x16 Root Port
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    0046  Core Processor Integrated Graphics Controller
+		144d c06a  R730 Laptop
+		17c0 10d9  Medion Akoya E7214 Notebook PC [MD98410]
    	e4bf 50c1  PC1-GROOVE
    0047  Core Processor Secondary PCI Express Root Port
    0048  Core Processor DRAM Controller
@@ -18619,7 +19669,8 @@
    0126  2nd Generation Core Processor Family Integrated Graphics Controller
    	1028 04cc  Vostro 3350
    0150  Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller
-		1043 84ca  P8H77-I Motherboard
+		1043 84ca  P8 series motherboard
+		15d9 0624  X9SCM-F Motherboard
    	1849 0150  Motherboard
    0151  Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port
    	1043 1477  N56VZ
@@ -18648,6 +19699,7 @@
    	1043 844d  P8 series motherboard
    015e  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
    0162  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
+		1043 84ca  P8 series motherboard
    	1849 0162  Motherboard
    0166  3rd Gen Core processor Graphics Controller
    	1043 1517  Zenbook Prime UX31A
@@ -18688,6 +19740,7 @@
    0416  4th Gen Core Processor Integrated Graphics Controller
    	17aa 220e  ThinkPad T440p
    041a  Xeon E3-1200 v3 Processor Integrated Graphics Controller
+	041e  4th Generation Core Processor Family Integrated Graphics Controller
    0433  Coleto Creek ACC - ME/CPM interface
    0435  Coleto Creek PCIe Endpoint
    0436  DH8900CC Null Device
@@ -18811,101 +19864,202 @@
    	8086 1015  Centrino Wireless-N 100 BGN
    	8086 1017  Centrino Wireless-N 100 BG
    08b1  Wireless 7260
-# Wilkins Peak 2 2x2 AGN + BT
+# Wilkins Peak 2
+		8086 4020  Dual Band Wireless-N 7260
+# Wilkins Peak 2
+		8086 402a  Dual Band Wireless-N 7260
+# Wilkins Peak 2
    	8086 4060  Dual Band Wireless-N 7260
-# Wilkins Peak 2 BGN + BT
+# Wilkins Peak 2
    	8086 4062  Wireless-N 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
+		8086 406a  Dual Band Wireless-N 7260
+# Wilkins Peak 2
    	8086 4070  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 2x2 AGN + BT
+# Wilkins Peak 2
+		8086 4072  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
    	8086 4160  Dual Band Wireless-N 7260
-# Wilkins Peak 2 BGN + BT
+# Wilkins Peak 2
    	8086 4162  Wireless-N 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
    	8086 4170  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 AGN + BT
+# Wilkins Peak 2
+		8086 4420  Dual Band Wireless-N 7260
+# Wilkins Peak 2
    	8086 4460  Dual Band Wireless-N 7260
-# Wilkins Peak 2 BGN + BT
+# Wilkins Peak 2
    	8086 4462  Wireless-N 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
+		8086 446a  Dual Band Wireless-N 7260
+# Wilkins Peak 2
    	8086 4470  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
+		8086 4472  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 4560  Dual Band Wireless-N 7260
+# Wilkins Peak 2
+		8086 4570  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
    	8086 486e  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
    	8086 4870  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
    	8086 4a6c  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
    	8086 4a6e  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
    	8086 4a70  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 2x2 80MHz (No BT)
+# Wilkins Peak 2
+		8086 4c60  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 4c70  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 5070  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 5072  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 5170  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 5770  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
    	8086 c020  Dual Band Wireless-N 7260
-# Wilkins Peak 2 2x2 AGN + BT
+# Wilkins Peak 2
+		8086 c02a  Dual Band Wireless-N 7260
+# Wilkins Peak 2
    	8086 c060  Dual Band Wireless-N 7260
-# Wilkins Peak 2 BGN + BT
+# Wilkins Peak 2
    	8086 c062  Wireless-N 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
+		8086 c06a  Dual Band Wireless-N 7260
+# Wilkins Peak 2
    	8086 c070  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 2x2 AGN + BT
+# Wilkins Peak 2
+		8086 c072  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
    	8086 c160  Dual Band Wireless-N 7260
-# Wilkins Peak 2 BGN + BT
+# Wilkins Peak 2
    	8086 c162  Wireless-N 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
    	8086 c170  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 2x2 AGN (No BT) - Dell
+# Wilkins Peak 2
+		8086 c360  Dual Band Wireless-N 7260
+# Wilkins Peak 2
    	8086 c420  Dual Band Wireless-N 7260
-# Wilkins Peak 2 AGN + BT
+# Wilkins Peak 2
    	8086 c460  Dual Band Wireless-N 7260
-# Wilkins Peak 2 BGN + BT
+# Wilkins Peak 2
    	8086 c462  Wireless-N 7260
-# Wilkins Peak 2 2x2 80MHz + BT
+# Wilkins Peak 2
    	8086 c470  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 c472  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 c560  Dual Band Wireless-N 7260
+# Wilkins Peak 2
+		8086 c570  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 c760  Dual Band Wireless-N 7260
+# Wilkins Peak 2
+		8086 c770  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 cc60  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 cc70  Dual Band Wireless-AC 7260
    08b2  Wireless 7260
-# Wilkins Peak 2 2x2 AGN (No BT) - Lenovo/HP
+# Wilkins Peak 2
    	8086 4220  Dual Band Wireless-N 7260
-# Wilkins Peak 2 2x2 AGN + BT - Lenovo/HP
+# Wilkins Peak 2
    	8086 4260  Dual Band Wireless-N 7260
-# Wilkins Peak 2 2x2 BGN + BT - Dell
+# Wilkins Peak 2
    	8086 4262  Wireless-N 7260
-# Wilkins Peak 2 2x2 80MHz + BT - Lenovo/HP
-		8086 4270  Dual Band Wireless-AC 7260
-# Wilkins Peak 2 2x2 80MHz (No BT) - Lenovo/HP
+# Wilkins Peak 2
+		8086 426a  Dual Band Wireless-N 7260
+# Wilkins Peak 2
+		8086 4270  Wireless-N 7260
+# Wilkins Peak 2
+		8086 4272  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 4360  Dual Band Wireless-N 7260
+# Wilkins Peak 2
+		8086 4370  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
    	8086 c220  Dual Band Wireless-N 7260
-# Wilkins Peak 2 2x2 AGN + BT - Lenovo/HP
+# Wilkins Peak 2
    	8086 c260  Dual Band Wireless-N 7260
-# Wilkins Peak 2 2x2 BGN + BT - Dell
+# Wilkins Peak 2
    	8086 c262  Wireless-N 7260
-# Wilkins Peak 2 2x2 80MHz + BT - Lenovo/HP
+# Wilkins Peak 2
+		8086 c26a  Dual Band Wireless-N 7260
+# Wilkins Peak 2
    	8086 c270  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 c272  Dual Band Wireless-AC 7260
+# Wilkins Peak 2
+		8086 c370  Dual Band Wireless-AC 7260
    08b3  Wireless 3160
-# Wilkins Peak 1 1x1 AGN + BT
+# Wilkins Peak 1
    	8086 0060  Dual Band Wireless-N 3160
-# Wilkins Peak 1 1x1 BGN + BT
+# Wilkins Peak 1
    	8086 0062  Wireless-N 3160
-# Wilkins Peak 1 1x1 80Mhz + BT
+# Wilkins Peak 1
    	8086 0070  Dual Band Wireless-AC 3160
-# Wilkins Peak 1 1x1 80Mhz + BT
+# Wilkins Peak 1
+		8086 0072  Dual Band Wireless-AC 3160
+# Wilkins Peak 1
    	8086 0170  Dual Band Wireless-AC 3160
-# Wilkins Peak 1 1x1 80Mhz + BT
+# Wilkins Peak 1
+		8086 0172  Dual Band Wireless-AC 3160
+# Wilkins Peak 1
+		8086 0260  Dual Band Wireless-N 3160
+# Wilkins Peak 1
    	8086 0470  Dual Band Wireless-AC 3160
-# Wilkins Peak 1 1x1 AGN + BT
+# Wilkins Peak 1
+		8086 0472  Dual Band Wireless-AC 3160
+# Wilkins Peak 1
+		8086 1070  Dual Band Wireless-AC 3160
+# Wilkins Peak 1
+		8086 1170  Dual Band Wireless-AC 3160
+# Wilkins Peak 1
    	8086 8060  Dual Band Wireless N-3160
-# Wilkins Peak 1 1x1 BGN + BT
+# Wilkins Peak 1
    	8086 8062  Wireless N-3160
-# Wilkins Peak 1 1x1 80Mhz + BT
+# Wilkins Peak 1
    	8086 8070  Dual Band Wireless AC 3160
-# Wilkins Peak 1 1x1 80Mhz + BT
+# Wilkins Peak 1
+		8086 8072  Dual Band Wireless AC 3160
+# Wilkins Peak 1
    	8086 8170  Dual Band Wireless AC 3160
-# Wilkins Peak 1 1x1 80Mhz + BT
+# Wilkins Peak 1
+		8086 8172  Dual Band Wireless AC 3160
+# Wilkins Peak 1
    	8086 8470  Dual Band Wireless AC 3160
+# Wilkins Peak 1
+		8086 8570  Dual Band Wireless AC 3160
    08b4  Wireless 3160
-# Wilkins Peak 1 1x1 80Mhz + BT - lenovo/HP
+# Wilkins Peak 1
    	8086 0270  Dual Band Wireless-AC 3160
-# Wilkins Peak 1 1x1 80Mhz + BT - lenovo/HP
+# Wilkins Peak 1
+		8086 0272  Dual Band Wireless-AC 3160
+# Wilkins Peak 1
+		8086 0370  Dual Band Wireless-AC 3160
+# Wilkins Peak 1
+		8086 8260  Dual Band Wireless AC 3160
+# Wilkins Peak 1
    	8086 8270  Dual Band Wireless AC 3160
+# Wilkins Peak 1
+		8086 8272  Dual Band Wireless AC 3160
+# Wilkins Peak 1
+		8086 8370  Dual Band Wireless AC 3160
 # PowerVR SGX 545
    08cf  Atom Processor Z2760 Integrated Graphics Controller
+	0953  PCIe Data Center SSD
+		8086 3702  DC P3700 SSD
+		8086 3703  DC P3700 SSD [2.5" SFF]
+		8086 3704  DC P3500 SSD [Add-in Card]
+		8086 3705  DC P3500 SSD [2.5" SFF]
+		8086 3709  DC P3600 SSD [Add-in Card]
+		8086 370a  DC P3600 SSD [2.5" SFF]
    095a  Wireless 7265
 # Stone Peak 2 AC
    	8086 1010  Dual Band Wireless-AC 7265
@@ -18927,6 +20081,8 @@
    	8086 5090  Dual Band Wireless-AC 7265
 # Stone Peak 2 AGN
    	8086 5100  Dual Band Wireless-AC 7265
+# Stone Peak 2 BGN
+		8086 5102  Wireless-N 7265
 # Stone Peak 2 AGN
    	8086 510a  Dual Band Wireless-AC 7265
 # Stone Peak 2 AC
@@ -18939,12 +20095,20 @@
    	8086 5400  Dual Band Wireless-AC 7265
 # Stone Peak 2 AC
    	8086 5410  Dual Band Wireless-AC 7265
+# Stone Peak 2 AC
+		8086 5412  Dual Band Wireless-AC 7265
 # Stone Peak 2 AGN
    	8086 5420  Dual Band Wireless-N 7265
 # Maple Peak AC
    	8086 5490  Dual Band Wireless-AC 7265
+# Stone Peak 2 AC
+		8086 5510  Dual Band Wireless-AC 7265
 # Maple Peak AC
    	8086 5590  Dual Band Wireless-AC 7265
+# Stone Peak 2 AGN
+		8086 9000  Dual Band Wireless-AC 7265
+# Stone Peak 2 AGN
+		8086 900a  Dual Band Wireless-AC 7265
 # Stone Peak 2 AC
    	8086 9010  Dual Band Wireless-AC 7265
 # Stone Peak 2 AC
@@ -18957,6 +20121,8 @@
    	8086 9210  Dual Band Wireless-AC 7265
 # Stone Peak 2 AC
    	8086 9310  Dual Band Wireless-AC 7265
+# Stone Peak 2 AGN
+		8086 9400  Dual Band Wireless-AC 7265
 # Stone Peak 2 AC
    	8086 9410  Dual Band Wireless-AC 7265
 # Stone Peak 2 AC
@@ -18966,14 +20132,20 @@
    	8086 5200  Dual Band Wireless-N 7265
 # Stone Peak 2 BGN
    	8086 5202  Wireless-N 7265
+# Stone Peak 2 AGN
+		8086 520a  Dual Band Wireless-N 7265
 # Stone Peak 2 AC
    	8086 5210  Dual Band Wireless-AC 7265
+# Stone Peak 2 AC
+		8086 5212  Dual Band Wireless-AC 7265
 # Maple Peak AC
    	8086 5290  Dual Band Wireless-AC 7265
 # Stone Peak 2 BGN
-		8086 5302  Dual Band Wireless-AC 7265
+		8086 5302  Wireless-N 7265
 # Stone Peak 2 AC
    	8086 5310  Dual Band Wireless-AC 7265
+# Stone Peak 2 AGN
+		8086 9200  Dual Band Wireless-AC 7265
    0960  80960RP (i960RP) Microprocessor/Bridge
    0962  80960RM (i960RM) Bridge
    0964  80960RP (i960RP) Microprocessor/Bridge
@@ -18987,6 +20159,7 @@
    0a22  Haswell-ULT Integrated Graphics Controller
    0a26  Haswell-ULT Integrated Graphics Controller
    0a2a  Haswell-ULT Integrated Graphics Controller
+	0a2e  Haswell-ULT Integrated Graphics Controller
    0be0  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
    0be1  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
    	105b 0d7c  D270S/D250S Motherboard
@@ -19199,85 +20372,43 @@
    0efb  Xeon E7 v2/Xeon E5 v2/Core i7 DDRIO
    0efc  Xeon E7 v2/Xeon E5 v2/Core i7 DDRIO
    0efd  Xeon E7 v2/Xeon E5 v2/Core i7 DDRIO
-	0f00  ValleyView SSA-CUnit
-	0f01  ValleyView SSA-CUnit
-	0f02  ValleyView SSA-CUnit
-	0f03  ValleyView SSA-CUnit
-	0f04  ValleyView High Definition Audio Controller
-	0f05  ValleyView High Definition Audio Controller
-	0f06  ValleyView LPIO1 DMA Controller
-	0f07  ValleyView LPIO1 DMA Controller
-	0f08  ValleyView LPIO1 PWM Controller
-	0f09  ValleyView LPIO1 PWM Controller
-	0f0a  ValleyView LPIO1 HSUART Controller #1
-	0f0b  ValleyView LPIO1 HSUART Controller #1
-	0f0c  ValleyView LPIO1 HSUART Controller #2
-	0f0d  ValleyView LPIO1 HSUART Controller #2
-	0f0e  ValleyView LPIO1 SPI Controller
-	0f0f  ValleyView LPIO1 SPI Controller
-	0f10  ValleyView LPIO1 Controller
-	0f11  ValleyView LPIO1 Controller
-	0f12  ValleyView SMBus Controller
-	0f13  ValleyView SMBus Controller
-	0f14  ValleyView SDIO Controller
-	0f15  ValleyView SDIO Controller
-	0f16  ValleyView SDIO Controller
-	0f17  ValleyView SDIO Controller
-	0f18  ValleyView SEC
-	0f19  ValleyView SEC
-	0f1a  ValleyView SEC
-	0f1b  ValleyView SEC
-	0f1c  ValleyView Power Control Unit
-	0f1d  ValleyView Power Control Unit
-	0f1e  ValleyView Power Control Unit
-	0f1f  ValleyView Power Control Unit
-	0f20  ValleyView 4-Port SATA Storage Controller
-	0f21  ValleyView 4-Port SATA Storage Controller
-	0f22  ValleyView 6-Port SATA AHCI Controller
-	0f23  ValleyView 6-Port SATA AHCI Controller
-	0f24  ValleyView SATA RAID Storage Controller
-	0f25  ValleyView SATA RAID Storage Controller
-	0f26  ValleyView 2-Port SATA Storage Controller
-	0f27  ValleyView 2-Port SATA Storage Controller
-	0f28  ValleyView LPE Audio Controller
-	0f29  ValleyView LPE Audio Controller
-	0f2a  ValleyView LPE Audio Controller
-	0f2b  ValleyView LPE Audio Controller
-	0f2e  ValleyView SATA RAID Storage Controller
-	0f2f  ValleyView SATA RAID Storage Controller
-	0f30  ValleyView Gen7
-	0f31  ValleyView Gen7
-	0f32  ValleyView Gen7
-	0f33  ValleyView Gen7
-	0f34  ValleyView USB Enhanced Host Controller
-	0f35  ValleyView USB xHCI Host Controller
-	0f36  ValleyView USB xHCI Host Controller
-	0f37  ValleyView OTG
-	0f38  ValleyView ISP
-	0f39  ValleyView ISP
-	0f3a  ValleyView ISP
-	0f3b  ValleyView ISP
-	0f3c  ValleyView ISP
-	0f3d  ValleyView ISP
-	0f3e  ValleyView ISP
-	0f3f  ValleyView ISP
-	0f40  ValleyView LPIO2 DMA Controller
-	0f41  ValleyView LPIO2 I2C Controller #1
-	0f42  ValleyView LPIO2 I2C Controller #2
-	0f43  ValleyView LPIO2 I2C Controller #3
-	0f44  ValleyView LPIO2 I2C Controller #4
-	0f45  ValleyView LPIO2 I2C Controller #5
-	0f46  ValleyView LPIO2 I2C Controller #6
-	0f47  ValleyView LPIO2 I2C Controller #7
-	0f48  ValleyView PCI Express Root Port
-	0f49  ValleyView PCI Express Root Port
-	0f4a  ValleyView PCI Express Root Port
-	0f4b  ValleyView PCI Express Root Port
-	0f4c  ValleyView PCI Express Root Port
-	0f4d  ValleyView PCI Express Root Port
-	0f4e  ValleyView PCI Express Root Port
-	0f4f  ValleyView PCI Express Root Port
-	0f50  ValleyView MIPI-HSI Controller
+	0f00  Atom Processor Z36xxx/Z37xxx Series SoC Transaction Register
+	0f04  Atom Processor Z36xxx/Z37xxx Series High Definition Audio Controller
+	0f06  Atom Processor Z36xxx/Z37xxx Series LPIO1 DMA Controller
+	0f08  Atom Processor Z36xxx/Z37xxx Series LPIO1 PWM Controller
+	0f09  Atom Processor Z36xxx/Z37xxx Series LPIO1 PWM Controller
+	0f0a  Atom Processor Z36xxx/Z37xxx Series LPIO1 HSUART Controller #1
+	0f0c  Atom Processor Z36xxx/Z37xxx Series LPIO1 HSUART Controller #2
+	0f0e  Atom Processor Z36xxx/Z37xxx Series LPIO1 SPI Controller
+	0f12  Atom Processor E3800 Series SMBus Controller
+	0f14  Atom Processor Z36xxx/Z37xxx Series SDIO Controller
+	0f15  Atom Processor Z36xxx/Z37xxx Series SDIO Controller
+	0f16  Atom Processor Z36xxx/Z37xxx Series SDIO Controller
+	0f18  Atom Processor Z36xxx/Z37xxx Series Trusted Execution Engine
+	0f1c  Atom Processor Z36xxx/Z37xxx Series Power Control Unit
+	0f20  Atom Processor E3800 Series SATA IDE Controller
+	0f21  Atom Processor E3800 Series SATA IDE Controller
+	0f22  Atom Processor E3800 Series SATA AHCI Controller
+	0f23  Atom Processor E3800 Series SATA AHCI Controller
+	0f28  Atom Processor Z36xxx/Z37xxx Series LPE Audio Controller
+	0f31  Atom Processor Z36xxx/Z37xxx Series Graphics & Display
+	0f34  Atom Processor Z36xxx/Z37xxx Series USB EHCI
+	0f35  Atom Processor Z36xxx/Z37xxx Series USB xHCI
+	0f37  Atom Processor Z36xxx/Z37xxx Series OTG USB Device
+	0f38  Atom Processor Z36xxx/Z37xxx Series Camera ISP
+	0f40  Atom Processor Z36xxx/Z37xxx Series LPIO2 DMA Controller
+	0f41  Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #1
+	0f42  Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #2
+	0f43  Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #3
+	0f44  Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #4
+	0f45  Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #5
+	0f46  Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #6
+	0f47  Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #7
+	0f48  Atom Processor E3800 Series PCI Express Root Port 1
+	0f4a  Atom Processor E3800 Series PCI Express Root Port 2
+	0f4c  Atom Processor E3800 Series PCI Express Root Port 3
+	0f4e  Atom Processor E3800 Series PCI Express Root Port 4
+	0f50  Atom Processor E3800 Series eMMC 4.5 Controller
    1000  82542 Gigabit Ethernet Controller (Fiber)
    	0e11 b0df  NC6132 Gigabit Ethernet Adapter (1000-SX)
    	0e11 b0e0  NC6133 Gigabit Ethernet Adapter (1000-LX)
@@ -19571,6 +20702,7 @@
    108f  Active Management Technology - SOL
    1091  PRO/100 VM Network Connection
    1092  PRO/100 VE Network Connection
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    1093  PRO/100 VM Network Connection
    1094  PRO/100 VE Network Connection
    1095  PRO/100 VE Network Connection
@@ -19662,8 +20794,10 @@
    10cd  82567LF-2 Gigabit Network Connection
    10ce  82567V-2 Gigabit Network Connection
    10d3  82574L Gigabit Network Connection
+		103c 1785  NC112i 1-port Ethernet Server Adapter
    	103c 3250  NC112T PCI Express single Port Gigabit Server Adapter
    	1043 8369  Motherboard
+		1093 76e9  PCIe-8233 Ethernet Adapter
    	10a9 8029  Prism XL Single Port Gigabit Ethernet
    	15d9 060a  X7SPA-H/X7SPA-HF Motherboard
    	15d9 060d  C7SIM-Q Motherboard
@@ -20009,8 +21143,8 @@
    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 1f60  Gigabit 4P I350-t rNDC
+		1028 1f62  Gigabit 4P X540/I350 rNDC
    	1028 ff9a  Gigabit 4P X710/I350 rNDC
    	103c 17d1  Ethernet 1Gb 4-port 366FLR Adapter
    	103c 2003  Ethernet 1Gb 2-port 367i Adapter
@@ -20020,6 +21154,10 @@
    	103c 339e  Ethernet 1Gb 2-port 361T Adapter
    	108e 7b16  Quad Port GbE PCIe 2.0 ExpressModule, UTP
    	108e 7b18  Quad Port GbE PCIe 2.0 Low Profile Adapter, UTP
+		1093 7648  PCIe-8237R Ethernet Adapter
+		1093 7649  PCIe-8236 Ethernet Adapter
+		1093 76b1  PCIe-8237R-S Ethernet Adapter
+		1093 775b  PCIe-8237 Ethernet Adapter
    	10a9 802a  UV2-BaseIO dual-port GbE
    	17aa 1074  ThinkServer I350-T4 AnyFabric
    	8086 0001  Ethernet Server Adapter I350-T4
@@ -20039,7 +21177,8 @@
    	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
+		1028 0060  Gigabit 2P I350 LOM
+		1028 1f9b  Gigabit 4P I350-t 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
@@ -20071,13 +21210,16 @@
    1529  82599 10 Gigabit Dual Port Network Connection with FCoE
    152a  82599 10 Gigabit Dual Port Backplane Connection with FCoE
    1533  I210 Gigabit Network Connection
-		103c 0003  Ethernet Server Adapter I210-T1
+		103c 0003  Ethernet I210-T1 GbE NIC
+		1093 7706  Compact Vision System Ethernet Adapter
+		10a9 802c  UV300 BaseIO single-port GbE
+		10a9 802d  UV3000 BaseIO GbE Network
    	17aa 1100  ThinkServer Ethernet Server Adapter
    	8086 0001  Ethernet Server Adapter I210-T1
    	8086 0002  Ethernet Server Adapter I210-T1
-	1534  I210 Gigabit Network Connection
    1536  I210 Gigabit Fiber Network Connection
    1537  I210 Gigabit Backplane Connection
+	1538  I210 Gigabit Network Connection
    1539  I211 Gigabit Network Connection
    153a  Ethernet Connection I217-LM
    	103c 1909  ZBook 15
@@ -20089,7 +21231,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
@@ -20108,26 +21250,31 @@
    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
+		17aa 0000  ThinkServer XL710 AnyFabric
+		17aa 4001  ThinkServer XL710-4 AnyFabric
+		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
    	8086 0001  Ethernet Converged Network Adapter XL710-Q2
    	8086 0002  Ethernet Converged Network Adapter XL710-Q2
    	8086 0003  Ethernet I/O Module XL710-Q2
    1584  Ethernet Controller XL710 for 40GbE QSFP+
+		8086 0000  Ethernet Converged Network Adapter XL710-Q1
    	8086 0001  Ethernet Converged Network Adapter XL710-Q1
    	8086 0002  Ethernet Converged Network Adapter XL710-Q1
    	8086 0003  Ethernet I/O Module XL710-Q1
@@ -20136,6 +21283,13 @@
    15a1  Ethernet Connection (2) I218-V
    15a2  Ethernet Connection (3) I218-LM
    15a3  Ethernet Connection (3) I218-V
+	15a8  Ethernet Connection X552 Virtual Function
+	15aa  Ethernet Connection X552 10 GbE Backplane
+	15ab  Ethernet Connection X552 10 GbE Backplane
+	15ac  Ethernet Connection X552 10 GbE SFP+
+	15ad  Ethernet Connection X552/X557-AT 10GBASE-T
+	15b7  Ethernet Connection (2) I219-LM
+	15b8  Ethernet Connection (2) I219-V
    1600  Broadwell-U Host Bridge -OPI
    1601  Broadwell-U PCI Express x16 Controller
    1602  Broadwell-U Integrated Graphics
@@ -20173,6 +21327,25 @@
    163b  Broadwell-U Integrated Graphics
    163d  Broadwell-U Integrated Graphics
    163e  Broadwell-U Integrated Graphics
+	1900  Sky Lake Host Bridge/DRAM Registers
+	1901  Sky Lake PCIe Controller (x16)
+	1904  Sky Lake Host Bridge/DRAM Registers
+	1905  Sky Lake PCIe Controller (x8)
+	1908  Sky Lake Host Bridge/DRAM Registers
+	1909  Sky Lake PCIe Controller (x4)
+	190c  Sky Lake Host Bridge/DRAM Registers
+	190f  Sky Lake Host Bridge/DRAM Registers
+	1910  Sky Lake Host Bridge/DRAM Registers
+	1911  Sky Lake Gaussian Mixture Model
+	1912  Sky Lake Integrated Graphics
+	1916  Sky Lake Integrated Graphics
+	1918  Sky Lake Host Bridge/DRAM Registers
+	1919  Sky Lake Imaging Unit
+	191e  Sky Lake Integrated Graphics
+	191f  Sky Lake Host Bridge/DRAM Registers
+	1926  Sky Lake Integrated Graphics
+	1932  Sky Lake Integrated Graphics
+	193b  Sky Lake Integrated Graphics
    1960  80960RP (i960RP) Microprocessor
    	101e 0431  MegaRAID 431 RAID Controller
    	101e 0438  MegaRAID 438 Ultra2 LVD RAID Controller
@@ -20228,6 +21401,7 @@
    	1028 04da  Vostro 3750
    	8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
    1c04  6 Series/C200 Series Chipset Family SATA RAID Controller
+		103c 3118  Smart Array B110i SATA RAID Controller
    1c05  6 Series/C200 Series Chipset Family SATA RAID Controller
    1c08  6 Series/C200 Series Chipset Family 2 port SATA IDE Controller
    1c09  6 Series/C200 Series Chipset Family 2 port SATA IDE Controller
@@ -20411,7 +21585,7 @@
    1e00  7 Series/C210 Series Chipset Family 4-port SATA Controller [IDE mode]
    1e01  7 Series Chipset Family 4-port SATA Controller [IDE mode]
    1e02  7 Series/C210 Series Chipset Family 6-port SATA Controller [AHCI mode]
-		1043 84ca  P8H77-I Motherboard
+		1043 84ca  P8 series motherboard
    	1849 1e02  Motherboard
    1e03  7 Series Chipset Family 6-port SATA Controller [AHCI mode]
    	1043 1477  N56VZ
@@ -20447,11 +21621,12 @@
    	1043 1477  N56VZ
    	1043 1517  Zenbook Prime UX31A
    	1043 8415  P8H77-I Motherboard
+		1043 8445  ASUS P8Z77-V LX Motherboard
    	1849 1898  Z77 Extreme4 motherboard
    1e22  7 Series/C210 Series Chipset Family SMBus Controller
    	1043 1477  N56VZ
    	1043 1517  Zenbook Prime UX31A
-		1043 84ca  P8H77-I Motherboard
+		1043 84ca  P8 series motherboard
    	1849 1e22  Motherboard
    1e24  7 Series/C210 Series Chipset Family Thermal Management Controller
    	1043 1517  Zenbook Prime UX31A
@@ -20459,24 +21634,24 @@
    1e26  7 Series/C210 Series Chipset Family USB Enhanced Host Controller #1
    	1043 1477  N56VZ
    	1043 1517  Zenbook Prime UX31A
-		1043 84ca  P8H77-I Motherboard
+		1043 84ca  P8 series motherboard
    	1849 1e26  Motherboard
    1e2d  7 Series/C210 Series Chipset Family USB Enhanced Host Controller #2
    	1043 1477  N56VZ
    	1043 1517  Zenbook Prime UX31A
-		1043 84ca  P8H77-I Motherboard
+		1043 84ca  P8 series motherboard
    	1849 1e2d  Motherboard
    1e31  7 Series/C210 Series Chipset Family USB xHCI Host Controller
    	103c 17ab  ProBook 6570b
    	1043 1477  N56VZ
    	1043 1517  Zenbook Prime UX31A
-		1043 84ca  P8H77-I Motherboard
+		1043 84ca  P8 series motherboard
    	1849 1e31  Motherboard
    1e33  7 Series/C210 Series Chipset Family LAN Controller
    1e3a  7 Series/C210 Series Chipset Family MEI Controller #1
    	1043 1477  N56VZ
    	1043 1517  Zenbook Prime UX31A
-		1043 84ca  P8H77-I Motherboard
+		1043 84ca  P8 series motherboard
    	1849 1e3a  Motherboard
    1e3b  7 Series/C210 Series Chipset Family MEI Controller #2
    1e3c  7 Series/C210 Series Chipset Family IDE-r Controller
@@ -20485,6 +21660,7 @@
    1e42  7 Series Chipset Family LPC Controller
    1e43  7 Series Chipset Family LPC Controller
    1e44  Z77 Express Chipset LPC Controller
+		1043 84ca  P8 series motherboard
    	1849 1e44  Motherboard
    1e45  7 Series Chipset Family LPC Controller
    1e46  Z75 Express Chipset LPC Controller
@@ -20573,6 +21749,42 @@
    1f42  Atom processor C2000 GbE
    1f44  Atom processor C2000 GbE Virtual Function
    1f45  Ethernet Connection I354 2.5 GbE Backplane
+	2014  Sky Lake-E Ubox Registers
+	2015  Sky Lake-E Ubox Registers
+	2016  Sky Lake-E Ubox Registers
+	2018  Sky Lake-E M2PCI Registers
+	201a  Sky Lake-E Non-Transparent Bridge Registers
+	201c  Sky Lake-E Non-Transparent Bridge Registers
+	2021  Sky Lake-E CBDMA Registers
+	2024  Sky Lake-E MM/Vt-d Configuration Registers
+	2030  Sky Lake-E PCI Express Root Port 1A
+	2031  Sky Lake-E PCI Express Root Port 1B
+	2032  Sky Lake-E PCI Express Root Port 1C
+	2033  Sky Lake-E PCI Express Root Port 1D
+	2035  Sky Lake-E RAS Configuration Registers
+	204c  Sky Lake-E M3KTI Registers
+	204d  Sky Lake-E M3KTI Registers
+	204e  Sky Lake-E M3KTI Registers
+	2054  Sky Lake-E CHA Registers
+	2055  Sky Lake-E CHA Registers
+	2056  Sky Lake-E CHA Registers
+	2057  Sky Lake-E CHA Registers
+	2068  Sky Lake-E DDRIO Registers
+	2069  Sky Lake-E DDRIO Registers
+	206a  Sky Lake-E IOxAPIC Configuration Registers
+	206e  Sky Lake-E DDRIO Registers
+	206f  Sky Lake-E DDRIO Registers
+	2078  Sky Lake-E PCU Registers
+	207a  Sky Lake-E PCU Registers
+	2080  Sky Lake-E PCU Registers
+	2081  Sky Lake-E PCU Registers
+	2082  Sky Lake-E PCU Registers
+	2083  Sky Lake-E PCU Registers
+	2084  Sky Lake-E PCU Registers
+	2085  Sky Lake-E PCU Registers
+	2086  Sky Lake-E PCU Registers
+	208d  Sky Lake-E CHA Registers
+	208e  Sky Lake-E CHA Registers
    2250  Xeon Phi coprocessor 5100 series
    225c  Xeon Phi coprocessor SE10/7120 series
    225d  Xeon Phi coprocessor 3120 series 
@@ -20702,11 +21914,15 @@
    	103c 30c1  Compaq 6910p
    	104d 902d  VAIO VGN-NR120E
    	105b 0d7c  D270S/D250S Motherboard
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	144d c00c  P30 notebook
+		144d c06a  R730 Laptop
    	144d c072  Notebook N150P
    	1458 5000  GA-D525TUD
    	1734 1055  Amilo M1420
    	17aa 20ae  ThinkPad T61/R61
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	8086 544b  Desktop Board D425KT
    	e4bf cc47  CCG-RUMBA
    2449  82801BA/BAM/CA/CAM Ethernet Controller
@@ -20912,7 +22128,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
@@ -20936,7 +22152,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
@@ -21745,11 +22961,13 @@
    	103c 30a1  NC2400
    	103c 30a3  Compaq nw8440
    	1043 1237  A6J-Q008
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	17aa 2015  ThinkPad T60
    	17aa 2017  ThinkPad R60/T60/X60 series
    27a1  Mobile 945GM/PM/GMS, 943/940GML and 945GT Express PCI Express Root Port
    	103c 309f  Compaq nx9420 Notebook
    	103c 30a3  Compaq nw8440
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    27a2  Mobile 945GM/GMS, 943/940GML Express Integrated Graphics Controller
    	103c 30a1  NC2400
    	17aa 201a  ThinkPad R60/T60/X60 series
@@ -21778,6 +22996,7 @@
    	103c 309f  Compaq nx9420 Notebook
    	103c 30a1  NC2400
    	103c 30a3  Compaq nw8440
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	10f7 8338  Panasonic CF-Y5 laptop
    	17aa 2009  ThinkPad R60/T60/X60 series
    27bc  NM10 Family LPC Controller
@@ -21815,6 +23034,7 @@
    27c4  82801GBM/GHM (ICH7-M Family) SATA Controller [IDE mode]
    	1025 006c  9814 WKMI
    	1028 01d7  XPS M1210
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	17aa 200e  ThinkPad T60
    27c5  82801GBM/GHM (ICH7-M Family) SATA Controller [AHCI mode]
    	103c 309f  Compaq nx9420 Notebook
@@ -21834,6 +23054,7 @@
    	1043 1237  A6J-Q008
    	1043 8179  P5KPL-VM,P5LD2-VM Mainboard
    	105b 0d7c  D270S/D250S Motherboard
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	107b 5048  E4500
    	144d c072  Notebook N150P
    	1458 5004  GA-D525TUD
@@ -21856,6 +23077,7 @@
    	1043 1237  A6J-Q008
    	1043 8179  P5KPL-VM,P5LD2-VM Mainboard
    	105b 0d7c  D270S/D250S Motherboard
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	107b 5048  E4500
    	144d c072  Notebook N150P
    	1458 5004  GA-D525TUD
@@ -21878,6 +23100,7 @@
    	1043 1237  A6J-Q008
    	1043 8179  P5KPL-VM,P5LD2-VM Mainboard
    	105b 0d7c  D270S/D250S Motherboard
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	107b 5048  E4500
    	144d c072  Notebook N150P
    	1458 5004  GA-D525TUD
@@ -21898,6 +23121,7 @@
    	1043 1237  A6J-Q008
    	1043 8179  P5KPL-VM,P5LD2-VM Mainboard
    	105b 0d7c  D270S/D250S Motherboard
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	107b 5048  E4500
    	144d c072  Notebook N150P
    	1458 5004  GA-D525TUD
@@ -21919,6 +23143,7 @@
    	1043 1237  A6J-Q008
    	1043 8179  P5KPL-VM,P5LD2-VM Mainboard
    	105b 0d7c  D270S/D250S Motherboard
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	144d c072  Notebook N150P
    	1458 5006  GA-D525TUD
    	1462 7418  Wind PC MS-7418
@@ -21930,6 +23155,7 @@
    27d0  NM10/ICH7 Family PCI Express Port 1
    	103c 309f  Compaq nx9420 Notebook
    	103c 30a3  Compaq nw8440
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	144d c072  Notebook N150P
    	1458 5001  GA-D525TUD
    	1462 7418  Wind PC MS-7418
@@ -21938,17 +23164,20 @@
    27d2  NM10/ICH7 Family PCI Express Port 2
    	103c 309f  Compaq nx9420 Notebook
    	103c 30a3  Compaq nw8440
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	144d c072  Notebook N150P
    	1462 7418  Wind PC MS-7418
    	1775 11cc  CC11/CL11
    	8086 544b  Desktop Board D425KT
    27d4  NM10/ICH7 Family PCI Express Port 3
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	144d c072  Notebook N150P
    	1462 7418  Wind PC MS-7418
    	1775 11cc  CC11/CL11
    	8086 544b  Desktop Board D425KT
    27d6  NM10/ICH7 Family PCI Express Port 4
    	103c 30a3  Compaq nw8440
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	144d c072  Notebook N150P
    	1462 7418  Wind PC MS-7418
    	1775 11cc  CC11/CL11
@@ -21966,6 +23195,7 @@
    	1043 8290  P5KPL-VM Motherboard
    	1043 82ea  P5KPL-CM Motherboard
    	105b 0d7c  D270S/D250S Motherboard
+		1071 8207  Medion MIM 2240 Notebook PC [MD98100]
    	107b 5048  E4500
    	10f7 8338  Panasonic CF-Y5 laptop
    	1179 ff10  Toshiba Satellite A100-796 audio (Realtek ALC861)
@@ -21992,6 +23222,7 @@
    	103c 2a3b  Pavilion A1512X
    	1043 8179  P5KPL-VM Motherboard
    	105b 0d7c  D270S/D250S Motherboard
+		1071 8209  Medion MIM 2240 Notebook PC [MD98100]
    	10f7 8338  Panasonic CF-Y5 laptop
    	144d c072  Notebook N150P
    	1458 5001  GA-8I945PG-RH/GA-D525TUD Mainboard
@@ -22045,21 +23276,22 @@
    	103c 30d9  Presario C700
    	104d 9005  Vaio VGN-FZ260E
    	104d 902d  VAIO VGN-NR120E
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    2820  82801H (ICH8 Family) 4 port SATA Controller [IDE mode]
    	1028 01da  OptiPlex 745
    	1462 7235  P965 Neo MS-7235 mainboard
    2821  82801HR/HO/HH (ICH8R/DO/DH) 6 port SATA Controller [AHCI mode]
-	2822  82801 SATA Controller [RAID mode]
+	2822  SATA Controller [RAID mode]
    	1028 020d  Inspiron 530
    	103c 2a6f  Asus IPIBL-LB Motherboard
-	2823  Wellsburg sSATA RAID Controller
+	2823  C610/X99 series chipset sSATA Controller [RAID mode]
    2824  82801HB (ICH8) 4 port SATA Controller [AHCI mode]
    	1043 81ec  P5B
    2825  82801HR/HO/HH (ICH8R/DO/DH) 2 port SATA Controller [IDE mode]
    	1028 01da  OptiPlex 745
    	1462 7235  P965 Neo MS-7235 mainboard
    2826  C600/X79 series chipset SATA RAID Controller
-	2827  Wellsburg sSATA RAID Controller
+	2827  C610/X99 series chipset sSATA Controller [RAID mode]
    2828  82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [IDE mode]
    	1028 01f3  Inspiron 1420
    	103c 30c0  Compaq 6710b
@@ -22073,6 +23305,7 @@
    	104d 9005  Vaio VGN-FZ260E
    	104d 902d  VAIO VGN-NR120E
    	17aa 20a7  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    282a  82801 Mobile SATA Controller [RAID mode]
    	1028 040b  Latitude E6510
@@ -22090,6 +23323,7 @@
    	104d 902d  VAIO VGN-NR120E
    	1462 7235  P965 Neo MS-7235 mainboard
    	17aa 20aa  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    2831  82801H (ICH8 Family) USB UHCI Controller #2
    	1025 0121  Aspire 5920G
@@ -22104,6 +23338,7 @@
    	104d 902d  VAIO VGN-NR120E
    	1462 7235  P965 Neo MS-7235 mainboard
    	17aa 20aa  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    2832  82801H (ICH8 Family) USB UHCI Controller #3
    	1025 0121  Aspire 5920G
@@ -22117,6 +23352,7 @@
    	104d 9005  Vaio VGN-FZ260E
    	104d 902d  VAIO VGN-NR120E
    	17aa 20aa  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    2833  82801H (ICH8 Family) USB UHCI Controller #4
    	1043 81ec  P5B
@@ -22132,6 +23368,7 @@
    	104d 902d  VAIO VGN-NR120E
    	1462 7235  P965 Neo MS-7235 mainboard
    	17aa 20aa  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    2835  82801H (ICH8 Family) USB UHCI Controller #5
    	1025 0121  Acer Aspire 5920G
@@ -22144,6 +23381,7 @@
    	104d 9005  Vaio VGN-FZ260E
    	104d 902d  VAIO VGN-NR120E
    	17aa 20aa  Thinkpad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    2836  82801H (ICH8 Family) USB2 EHCI Controller #1
    	1025 0121  Aspire 5920G
@@ -22158,6 +23396,7 @@
    	104d 902d  VAIO VGN-NR120E
    	1462 7235  P965 Neo MS-7235 mainboard
    	17aa 20ab  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    283a  82801H (ICH8 Family) USB2 EHCI Controller #2
    	1025 0121  Acer Aspire 5920G
@@ -22170,6 +23409,7 @@
    	104d 9005  Vaio VGN-FZ260E
    	104d 902d  VAIO VGN-NR120E
    	17aa 20ab  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    283e  82801H (ICH8 Family) SMBus Controller
    	1025 0121  Aspire 5920G
@@ -22182,25 +23422,31 @@
    	104d 902d  VAIO VGN-NR120E
    	1462 7235  P965 Neo MS-7235 mainboard
    	17aa 20a9  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    283f  82801H (ICH8 Family) PCI Express Port 1
    	1028 01da  OptiPlex 745
    	103c 30c1  Compaq 6910p
    	104d 902d  VAIO VGN-NR120E
    	17aa 20ad  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    2841  82801H (ICH8 Family) PCI Express Port 2
    	103c 30c1  Compaq 6910p
    	104d 902d  VAIO VGN-NR120E
    	17aa 20ad  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    2843  82801H (ICH8 Family) PCI Express Port 3
    	104d 902d  VAIO VGN-NR120E
    	17aa 20ad  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    2845  82801H (ICH8 Family) PCI Express Port 4
    	17aa 20ad  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    2847  82801H (ICH8 Family) PCI Express Port 5
    	1028 01da  OptiPlex 745
    	103c 30c1  Compaq 6910p
    	17aa 20ad  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    2849  82801H (ICH8 Family) PCI Express Port 6
    284b  82801H (ICH8 Family) HD Audio Controller
    	1025 011f  Realtek ALC268 audio codec
@@ -22223,6 +23469,7 @@
    	104d 902d  VAIO VGN-NR120E
    	14f1 5051  Presario C700
    	17aa 20ac  ThinkPad T61/R61
+		17c0 4088  Medion WIM 2210 Notebook PC [MD96850]
    	8384 7616  Dell Vostro 1400
    	e4bf cc47  CCG-RUMBA
    284f  82801H (ICH8 Family) Thermal Reporting Device
@@ -22236,6 +23483,7 @@
    	104d 9005  Vaio VGN-FZ260E
    	104d 902d  VAIO VGN-NR120E
    	17aa 20a6  ThinkPad T61/R61
+		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    2912  82801IH (ICH9DH) LPC Interface Controller
    2914  82801IO (ICH9DO) LPC Interface Controller
@@ -22562,6 +23810,7 @@
    	104d 902d  VAIO VGN-NR120E
    	17aa 20b1  ThinkPad T61
    	17aa 20b3  ThinkPad T61/R61
+		17c0 4082  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    2a01  Mobile PM965/GM965/GL960 PCI Express Root Port
    2a02  Mobile GM965/GL960 Integrated Graphics Controller (primary)
@@ -22571,13 +23820,15 @@
    	103c 30d9  Presario C700
    	104d 902d  VAIO VGN-NR120E
    	17aa 20b5  ThinkPad T61/R61
+		17c0 4082  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    2a03  Mobile GM965/GL960 Integrated Graphics Controller (secondary)
-		1028 01f3  Dell Inspiron 1420
+		1028 01f3  Inspiron 1420
    	103c 30c0  Compaq 6710b
    	103c 30d9  Presario C700
    	104d 902d  VAIO VGN-NR120E
    	17aa 20b5  ThinkPad T61/R61
+		17c0 4082  Medion WIM 2210 Notebook PC [MD96850]
    	e4bf cc47  CCG-RUMBA
    2a04  Mobile PM965/GM965 MEI Controller
    	103c 30c1  Compaq 6910p
@@ -22736,9 +23987,9 @@
    2cf3  Xeon C5500/C3500 Integrated Memory Controller Channel 2 Thermal Control
    2d01  Core Processor QuickPath Architecture System Address Decoder
    2d10  Core Processor QPI Link 0
-	2d11  Core Processor QPI Physical 0
-	2d12  Core Processor Reserved
-	2d13  Core Processor Reserved
+	2d11  1st Generation Core Processor QPI Physical 0
+	2d12  1st Generation Core Processor Reserved
+	2d13  1st Generation Core Processor Reserved
    2d81  Xeon 5600 Series QuickPath Architecture System Address Decoder
    2d90  Xeon 5600 Series QPI Link 0
    2d91  Xeon 5600 Series QPI Physical 0
@@ -22773,6 +24024,7 @@
    2e10  4 Series Chipset DRAM Controller
    2e11  4 Series Chipset PCI Express Root Port
    2e12  4 Series Chipset Integrated Graphics Controller
+		17aa 3048  ThinkCentre M6258
    2e13  4 Series Chipset Integrated Graphics Controller
    2e14  4 Series Chipset HECI Controller
    2e15  4 Series Chipset HECI Controller
@@ -22841,165 +24093,170 @@
    2e94  4 Series Chipset HECI Controller
    2e95  4 Series Chipset HECI Controller
    2e96  4 Series Chipset PT IDER Controller
-	2f00  Haswell-E DMI2
-	2f01  Haswell-E PCI Express Root Port 0
-	2f02  Haswell-E PCI Express Root Port 1
-	2f03  Haswell-E PCI Express Root Port 1
-	2f04  Haswell-E PCI Express Root Port 2
-	2f05  Haswell-E PCI Express Root Port 2
-	2f06  Haswell-E PCI Express Root Port 2
-	2f07  Haswell-E PCI Express Root Port 2
-	2f08  Haswell-E PCI Express Root Port 3
-	2f09  Haswell-E PCI Express Root Port 3
-	2f0a  Haswell-E PCI Express Root Port 3
-	2f0b  Haswell-E PCI Express Root Port 3
-	2f10  Haswell-E IIO Debug
-	2f11  Haswell-E IIO Debug
-	2f12  Haswell-E IIO Debug
-	2f13  Haswell-E IIO Debug
-	2f14  Haswell-E IIO Debug
-	2f15  Haswell-E IIO Debug
-	2f16  Haswell-E IIO Debug
-	2f17  Haswell-E IIO Debug
-	2f18  Haswell-E IIO Debug
-	2f19  Haswell-E IIO Debug
-	2f1a  Haswell-E IIO Debug
-	2f1b  Haswell-E IIO Debug
-	2f1c  Haswell-E IIO Debug
-	2f1d  Haswell-E PCIe Ring Interface
-	2f1e  Haswell-E Scratchpad & Semaphore Registers
-	2f1f  Haswell-E Scratchpad & Semaphore Registers
-	2f20  Haswell-E DMA Channel 0
-	2f21  Haswell-E DMA Channel 1
-	2f22  Haswell-E DMA Channel 2
-	2f23  Haswell-E DMA Channel 3
-	2f24  Haswell-E DMA Channel 4
-	2f25  Haswell-E DMA Channel 5
-	2f26  Haswell-E DMA Channel 6
-	2f27  Haswell-E DMA Channel 7
-	2f28  Haswell-E Address Map, VTd_Misc, System Management
-	2f29  Haswell-E Hot Plug
-	2f2a  Haswell-E RAS, Control Status and Global Errors
-	2f2c  Haswell-E I/O Apic
-	2f2e  Haswell-E RAID 5/6
-	2f2f  Haswell-E RAID 5/6
-	2f30  Haswell-E Home Agent 0
-	2f32  Haswell-E QPI Link 0
-	2f33  Haswell-E QPI Link 1
-	2f34  Haswell-E PCIe Ring Interface
-	2f36  Haswell-E R3 QPI Link 0 & 1 Monitoring
-	2f37  Haswell-E R3 QPI Link 0 & 1 Monitoring
-	2f38  Haswell-E Home Agent 1
-	2f39  Haswell-E I/O Performance Monitoring
-	2f3a  Haswell-E QPI Link 2
-	2f3e  Haswell-E R3 QPI Link 2 Monitoring
-	2f3f  Haswell-E R3 QPI Link 2 Monitoring
-	2f40  Haswell-E QPI Link 2
-	2f41  Haswell-E R3 QPI Link 2 Monitoring
-	2f43  Haswell-E QPI Link 2
-	2f45  Haswell-E QPI Link 2 Debug
-	2f46  Haswell-E QPI Link 2 Debug
-	2f47  Haswell-E QPI Link 2 Debug
-	2f60  Haswell-E Home Agent 1
-	2f68  Haswell-E Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
-	2f6a  Haswell-E Integrated Memory Controller 1 Channel Target Address Decoder
-	2f6b  Haswell-E Integrated Memory Controller 1 Channel Target Address Decoder
-	2f6c  Haswell-E Integrated Memory Controller 1 Channel Target Address Decoder
-	2f6d  Haswell-E Integrated Memory Controller 1 Channel Target Address Decoder
-	2f6e  Haswell-E DDRIO Channel 2/3 Broadcast
-	2f6f  Haswell-E DDRIO Global Broadcast
-	2f70  Haswell-E Home Agent 0 Debug
-	2f71  Haswell-E Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
-	2f76  Haswell-E E3 QPI Link Debug
-	2f78  Haswell-E Home Agent 1 Debug
-	2f79  Haswell-E Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
-	2f7d  Haswell-E Scratchpad & Semaphore Registers
-	2f7e  Haswell-E E3 QPI Link Debug
-	2f80  Haswell-E QPI Link 0
-	2f81  Haswell-E R3 QPI Link 0 & 1 Monitoring
-	2f83  Haswell-E QPI Link 0
-	2f85  Haswell-E QPI Link 0 Debug
-	2f86  Haswell-E QPI Link 0 Debug
-	2f87  Haswell-E QPI Link 0 Debug
-	2f88  Haswell-E VCU
-	2f8a  Haswell-E VCU
-	2f90  Haswell-E QPI Link 1
-	2f93  Haswell-E QPI Link 1
-	2f95  Haswell-E QPI Link 1 Debug
-	2f96  Haswell-E QPI Link 1 Debug
-	2f98  Haswell-E Power Control Unit
-	2f99  Haswell-E Power Control Unit
-	2f9a  Haswell-E Power Control Unit
-	2f9c  Haswell-E Power Control Unit
-	2fa0  Haswell-E Home Agent 0
-	2fa8  Haswell-E Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
-	2faa  Haswell-E Integrated Memory Controller 0 Channel Target Address Decoder
-	2fab  Haswell-E Integrated Memory Controller 0 Channel Target Address Decoder
-	2fac  Haswell-E Integrated Memory Controller 0 Channel Target Address Decoder
-	2fad  Haswell-E Integrated Memory Controller 0 Channel Target Address Decoder
-	2fae  Haswell-E DDRIO Channel 0/1 Broadcast
-	2faf  Haswell-E DDRIO Global Broadcast
-	2fb0  Haswell-E Integrated Memory Controller 0 Channel 0 Thermal Control
-	2fb1  Haswell-E Integrated Memory Controller 0 Channel 1 Thermal Control
-	2fb2  Haswell-E Integrated Memory Controller 0 Channel 0 ERROR Registers
-	2fb3  Haswell-E Integrated Memory Controller 0 Channel 1 ERROR Registers
-	2fb4  Haswell-E Integrated Memory Controller 0 Channel 2 Thermal Control
-	2fb5  Haswell-E Integrated Memory Controller 0 Channel 3 Thermal Control
-	2fb6  Haswell-E Integrated Memory Controller 0 Channel 2 ERROR Registers
-	2fb7  Haswell-E Integrated Memory Controller 0 Channel 3 ERROR Registers
-	2fb8  Haswell-E DDRIO (VMSE) 2 & 3
-	2fb9  Haswell-E DDRIO (VMSE) 2 & 3
-	2fba  Haswell-E DDRIO (VMSE) 2 & 3
-	2fbb  Haswell-E DDRIO (VMSE) 2 & 3
-	2fbc  Haswell-E DDRIO (VMSE) 0 & 1
-	2fbd  Haswell-E DDRIO (VMSE) 0 & 1
-	2fbe  Haswell-E DDRIO (VMSE) 0 & 1
-	2fbf  Haswell-E DDRIO (VMSE) 0 & 1
-	2fc0  Haswell-E Power Control Unit
-	2fc1  Haswell-E Power Control Unit
-	2fc2  Haswell-E Power Control Unit
-	2fc3  Haswell-E Power Control Unit
-	2fc4  Haswell-E Power Control Unit
-	2fc5  Haswell-E Power Control Unit
-	2fd0  Haswell-E Integrated Memory Controller 1 Channel 0 Thermal Control
-	2fd1  Haswell-E Integrated Memory Controller 1 Channel 1 Thermal Control
-	2fd2  Haswell-E Integrated Memory Controller 1 Channel 0 ERROR Registers
-	2fd3  Haswell-E Integrated Memory Controller 1 Channel 1 ERROR Registers
-	2fd4  Haswell-E Integrated Memory Controller 1 Channel 2 Thermal Control
-	2fd5  Haswell-E Integrated Memory Controller 1 Channel 3 Thermal Control
-	2fd6  Haswell-E Integrated Memory Controller 1 Channel 2 ERROR Registers
-	2fd7  Haswell-E Integrated Memory Controller 1 Channel 3 ERROR Registers
-	2fe0  Haswell-E Unicast Registers
-	2fe1  Haswell-E Unicast Registers
-	2fe2  Haswell-E Unicast Registers
-	2fe3  Haswell-E Unicast Registers
-	2fe4  Haswell-E Unicast Registers
-	2fe5  Haswell-E Unicast Registers
-	2fe6  Haswell-E Unicast Registers
-	2fe7  Haswell-E Unicast Registers
-	2fe8  Haswell-E Unicast Registers
-	2fe9  Haswell-E Unicast Registers
-	2fea  Haswell-E Unicast Registers
-	2feb  Haswell-E Unicast Registers
-	2fec  Haswell-E Unicast Registers
-	2fed  Haswell-E Unicast Registers
-	2fee  Haswell-E Unicast Registers
-	2fef  Haswell-E Unicast Registers
-	2ff0  Haswell-E Unicast Registers
-	2ff1  Haswell-E Unicast Registers
-	2ff2  Haswell-E Unicast Registers
-	2ff3  Haswell-E Unicast Registers
-	2ff4  Haswell-E Unicast Registers
-	2ff5  Haswell-E Unicast Registers
-	2ff6  Haswell-E Unicast Registers
-	2ff7  Haswell-E Unicast Registers
-	2ff8  Haswell-E Buffered Ring Agent
-	2ff9  Haswell-E Buffered Ring Agent
-	2ffa  Haswell-E Buffered Ring Agent
-	2ffb  Haswell-E Buffered Ring Agent
-	2ffc  Haswell-E System Address Decoder & Broadcast Registers
-	2ffd  Haswell-E System Address Decoder & Broadcast Registers
-	2ffe  Haswell-E System Address Decoder & Broadcast Registers
+	2f00  Xeon E5 v3/Core i7 DMI2
+	2f01  Xeon E5 v3/Core i7 PCI Express Root Port 0
+	2f02  Xeon E5 v3/Core i7 PCI Express Root Port 1
+	2f03  Xeon E5 v3/Core i7 PCI Express Root Port 1
+	2f04  Xeon E5 v3/Core i7 PCI Express Root Port 2
+	2f05  Xeon E5 v3/Core i7 PCI Express Root Port 2
+	2f06  Xeon E5 v3/Core i7 PCI Express Root Port 2
+	2f07  Xeon E5 v3/Core i7 PCI Express Root Port 2
+	2f08  Xeon E5 v3/Core i7 PCI Express Root Port 3
+	2f09  Xeon E5 v3/Core i7 PCI Express Root Port 3
+	2f0a  Xeon E5 v3/Core i7 PCI Express Root Port 3
+	2f0b  Xeon E5 v3/Core i7 PCI Express Root Port 3
+	2f10  Xeon E5 v3/Core i7 IIO Debug
+	2f11  Xeon E5 v3/Core i7 IIO Debug
+	2f12  Xeon E5 v3/Core i7 IIO Debug
+	2f13  Xeon E5 v3/Core i7 IIO Debug
+	2f14  Xeon E5 v3/Core i7 IIO Debug
+	2f15  Xeon E5 v3/Core i7 IIO Debug
+	2f16  Xeon E5 v3/Core i7 IIO Debug
+	2f17  Xeon E5 v3/Core i7 IIO Debug
+	2f18  Xeon E5 v3/Core i7 IIO Debug
+	2f19  Xeon E5 v3/Core i7 IIO Debug
+	2f1a  Xeon E5 v3/Core i7 IIO Debug
+	2f1b  Xeon E5 v3/Core i7 IIO Debug
+	2f1c  Xeon E5 v3/Core i7 IIO Debug
+	2f1d  Xeon E5 v3/Core i7 PCIe Ring Interface
+	2f1e  Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+	2f1f  Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+	2f20  Xeon E5 v3/Core i7 DMA Channel 0
+	2f21  Xeon E5 v3/Core i7 DMA Channel 1
+	2f22  Xeon E5 v3/Core i7 DMA Channel 2
+	2f23  Xeon E5 v3/Core i7 DMA Channel 3
+	2f24  Xeon E5 v3/Core i7 DMA Channel 4
+	2f25  Xeon E5 v3/Core i7 DMA Channel 5
+	2f26  Xeon E5 v3/Core i7 DMA Channel 6
+	2f27  Xeon E5 v3/Core i7 DMA Channel 7
+	2f28  Xeon E5 v3/Core i7 Address Map, VTd_Misc, System Management
+	2f29  Xeon E5 v3/Core i7 Hot Plug
+	2f2a  Xeon E5 v3/Core i7 RAS, Control Status and Global Errors
+	2f2c  Xeon E5 v3/Core i7 I/O APIC
+	2f2e  Xeon E5 v3/Core i7 RAID 5/6
+	2f2f  Xeon E5 v3/Core i7 RAID 5/6
+	2f30  Xeon E5 v3/Core i7 Home Agent 0
+	2f32  Xeon E5 v3/Core i7 QPI Link 0
+	2f33  Xeon E5 v3/Core i7 QPI Link 1
+	2f34  Xeon E5 v3/Core i7 PCIe Ring Interface
+	2f36  Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+	2f37  Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+	2f38  Xeon E5 v3/Core i7 Home Agent 1
+	2f39  Xeon E5 v3/Core i7 I/O Performance Monitoring
+	2f3a  Xeon E5 v3/Core i7 QPI Link 2
+	2f3e  Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+	2f3f  Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+	2f40  Xeon E5 v3/Core i7 QPI Link 2
+	2f41  Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+	2f43  Xeon E5 v3/Core i7 QPI Link 2
+	2f45  Xeon E5 v3/Core i7 QPI Link 2 Debug
+	2f46  Xeon E5 v3/Core i7 QPI Link 2 Debug
+	2f47  Xeon E5 v3/Core i7 QPI Link 2 Debug
+	2f60  Xeon E5 v3/Core i7 Home Agent 1
+	2f68  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
+	2f6a  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+	2f6b  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+	2f6c  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+	2f6d  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+	2f6e  Xeon E5 v3/Core i7 DDRIO Channel 2/3 Broadcast
+	2f6f  Xeon E5 v3/Core i7 DDRIO Global Broadcast
+	2f70  Xeon E5 v3/Core i7 Home Agent 0 Debug
+	2f71  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
+	2f76  Xeon E5 v3/Core i7 E3 QPI Link Debug
+	2f78  Xeon E5 v3/Core i7 Home Agent 1 Debug
+	2f79  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
+	2f7d  Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+	2f7e  Xeon E5 v3/Core i7 E3 QPI Link Debug
+	2f80  Xeon E5 v3/Core i7 QPI Link 0
+	2f81  Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+	2f83  Xeon E5 v3/Core i7 QPI Link 0
+	2f85  Xeon E5 v3/Core i7 QPI Link 0 Debug
+	2f86  Xeon E5 v3/Core i7 QPI Link 0 Debug
+	2f87  Xeon E5 v3/Core i7 QPI Link 0 Debug
+	2f88  Xeon E5 v3/Core i7 VCU
+	2f8a  Xeon E5 v3/Core i7 VCU
+	2f90  Xeon E5 v3/Core i7 QPI Link 1
+	2f93  Xeon E5 v3/Core i7 QPI Link 1
+	2f95  Xeon E5 v3/Core i7 QPI Link 1 Debug
+	2f96  Xeon E5 v3/Core i7 QPI Link 1 Debug
+	2f98  Xeon E5 v3/Core i7 Power Control Unit
+	2f99  Xeon E5 v3/Core i7 Power Control Unit
+	2f9a  Xeon E5 v3/Core i7 Power Control Unit
+	2f9c  Xeon E5 v3/Core i7 Power Control Unit
+	2fa0  Xeon E5 v3/Core i7 Home Agent 0
+	2fa8  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
+	2faa  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+	2fab  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+	2fac  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+	2fad  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+	2fae  Xeon E5 v3/Core i7 DDRIO Channel 0/1 Broadcast
+	2faf  Xeon E5 v3/Core i7 DDRIO Global Broadcast
+	2fb0  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 Thermal Control
+	2fb1  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 Thermal Control
+	2fb2  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 ERROR Registers
+	2fb3  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 ERROR Registers
+	2fb4  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 Thermal Control
+	2fb5  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 Thermal Control
+	2fb6  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 ERROR Registers
+	2fb7  Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 ERROR Registers
+	2fb8  Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+	2fb9  Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+	2fba  Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+	2fbb  Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+	2fbc  Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+	2fbd  Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+	2fbe  Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+	2fbf  Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+	2fc0  Xeon E5 v3/Core i7 Power Control Unit
+	2fc1  Xeon E5 v3/Core i7 Power Control Unit
+	2fc2  Xeon E5 v3/Core i7 Power Control Unit
+	2fc3  Xeon E5 v3/Core i7 Power Control Unit
+	2fc4  Xeon E5 v3/Core i7 Power Control Unit
+	2fc5  Xeon E5 v3/Core i7 Power Control Unit
+	2fd0  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 Thermal Control
+	2fd1  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 Thermal Control
+	2fd2  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 ERROR Registers
+	2fd3  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 ERROR Registers
+	2fd4  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 Thermal Control
+	2fd5  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 Thermal Control
+	2fd6  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 ERROR Registers
+	2fd7  Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 ERROR Registers
+	2fe0  Xeon E5 v3/Core i7 Unicast Registers
+	2fe1  Xeon E5 v3/Core i7 Unicast Registers
+	2fe2  Xeon E5 v3/Core i7 Unicast Registers
+	2fe3  Xeon E5 v3/Core i7 Unicast Registers
+	2fe4  Xeon E5 v3/Core i7 Unicast Registers
+	2fe5  Xeon E5 v3/Core i7 Unicast Registers
+	2fe6  Xeon E5 v3/Core i7 Unicast Registers
+	2fe7  Xeon E5 v3/Core i7 Unicast Registers
+	2fe8  Xeon E5 v3/Core i7 Unicast Registers
+	2fe9  Xeon E5 v3/Core i7 Unicast Registers
+	2fea  Xeon E5 v3/Core i7 Unicast Registers
+	2feb  Xeon E5 v3/Core i7 Unicast Registers
+	2fec  Xeon E5 v3/Core i7 Unicast Registers
+	2fed  Xeon E5 v3/Core i7 Unicast Registers
+	2fee  Xeon E5 v3/Core i7 Unicast Registers
+	2fef  Xeon E5 v3/Core i7 Unicast Registers
+	2ff0  Xeon E5 v3/Core i7 Unicast Registers
+	2ff1  Xeon E5 v3/Core i7 Unicast Registers
+	2ff2  Xeon E5 v3/Core i7 Unicast Registers
+	2ff3  Xeon E5 v3/Core i7 Unicast Registers
+	2ff4  Xeon E5 v3/Core i7 Unicast Registers
+	2ff5  Xeon E5 v3/Core i7 Unicast Registers
+	2ff6  Xeon E5 v3/Core i7 Unicast Registers
+	2ff7  Xeon E5 v3/Core i7 Unicast Registers
+	2ff8  Xeon E5 v3/Core i7 Buffered Ring Agent
+	2ff9  Xeon E5 v3/Core i7 Buffered Ring Agent
+	2ffa  Xeon E5 v3/Core i7 Buffered Ring Agent
+	2ffb  Xeon E5 v3/Core i7 Buffered Ring Agent
+	2ffc  Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+	2ffd  Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+	2ffe  Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+	3165  Wireless 3165
+# Stone Peak 1x1
+		8086 4010  Dual Band Wireless AC 3165
+# Stone Peak 1x1
+		8086 4210  Dual Band Wireless AC 3165
    3200  GD31244 PCI-X SATA HBA
    	1775 c200  C2K onboard SATA host bus adapter
    3310  IOP348 I/O Processor
@@ -23403,6 +24660,8 @@
    3b08  5 Series Chipset LPC Interface Controller
    3b09  Mobile 5 Series Chipset LPC Interface Controller
    	1025 0347  Aspire 7740G
+		144d c06a  R730 Laptop
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    3b0a  5 Series Chipset LPC Interface Controller
    	1028 02da  OptiPlex 980
    	15d9 060d  C7SIM-Q Motherboard
@@ -23434,12 +24693,19 @@
    	15d9 060d  C7SIM-Q Motherboard
    3b23  5 Series/3400 Series Chipset 4 port SATA AHCI Controller
    3b25  5 Series/3400 Series Chipset SATA RAID Controller
+		103c 3118  HP Smart Array B110i SATA RAID Controller
    3b26  5 Series/3400 Series Chipset 2 port SATA IDE Controller
    3b28  5 Series/3400 Series Chipset 4 port SATA IDE Controller
+		144d c06a  R730 Laptop
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    3b29  5 Series/3400 Series Chipset 4 port SATA AHCI Controller
    	1025 0347  Aspire 7740G
+		144d c06a  R730 Laptop
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    3b2c  5 Series/3400 Series Chipset SATA RAID Controller
    3b2d  5 Series/3400 Series Chipset 2 port SATA IDE Controller
+		144d c06a  R730 Laptop
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    	e4bf 50c1  PC1-GROOVE
    3b2e  5 Series/3400 Series Chipset 4 port SATA IDE Controller
    	e4bf 50c1  PC1-GROOVE
@@ -23450,15 +24716,21 @@
    	1025 0347  Aspire 7740G
    	1028 02da  OptiPlex 980
    	1028 040b  Latitude E6510
+		144d c06a  R730 Laptop
    	15d9 060d  C7SIM-Q Motherboard
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    	e4bf 50c1  PC1-GROOVE
    3b32  5 Series/3400 Series Chipset Thermal Subsystem
    	1025 0347  Aspire 7740G
+		144d c06a  R730 Laptop
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    3b34  5 Series/3400 Series Chipset USB2 Enhanced Host Controller
    	1025 0347  Aspire 7740G
    	1028 02da  OptiPlex 980
    	1028 040b  Latitude E6510
+		144d c06a  R730 Laptop
    	15d9 060d  C7SIM-Q Motherboard
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    	e4bf 50c1  PC1-GROOVE
    3b36  5 Series/3400 Series Chipset USB Universal Host Controller
    3b37  5 Series/3400 Series Chipset USB Universal Host Controller
@@ -23470,7 +24742,9 @@
    	1025 0347  Aspire 7740G
    	1028 02da  OptiPlex 980
    	1028 040b  Latitude E6510
+		144d c06a  R730 Laptop
    	15d9 060d  C7SIM-Q Motherboard
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    	e4bf 50c1  PC1-GROOVE
    3b3e  5 Series/3400 Series Chipset USB Universal Host Controller
    3b3f  5 Series/3400 Series Chipset USB Universal Host Controller
@@ -23479,16 +24753,23 @@
    3b42  5 Series/3400 Series Chipset PCI Express Root Port 1
    	1028 02da  OptiPlex 980
    	1028 040b  Latitude E6510
+		144d c06a  R730 Laptop
    	15d9 060d  C7SIM-Q Motherboard
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    3b44  5 Series/3400 Series Chipset PCI Express Root Port 2
    	1028 040b  Latitude E6510
    	15d9 060d  C7SIM-Q Motherboard
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    3b46  5 Series/3400 Series Chipset PCI Express Root Port 3
    	1028 040b  Latitude E6510
+		144d c06a  R730 Laptop
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    3b48  5 Series/3400 Series Chipset PCI Express Root Port 4
    	1028 040b  Latitude E6510
+		144d c06a  R730 Laptop
    3b4a  5 Series/3400 Series Chipset PCI Express Root Port 5
    	1028 02da  OptiPlex 980
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    3b4c  5 Series/3400 Series Chipset PCI Express Root Port 6
    3b4e  5 Series/3400 Series Chipset PCI Express Root Port 7
    3b50  5 Series/3400 Series Chipset PCI Express Root Port 8
@@ -23497,12 +24778,15 @@
    	1025 0347  Aspire 7740G
    	1028 02da  OptiPlex 980
    	1028 040b  Latitude E6510
+		144d c06a  R730 Laptop
    	15d9 060d  C7SIM-Q Motherboard
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    	e4bf 50c1  PC1-GROOVE
    3b57  5 Series/3400 Series Chipset High Definition Audio
    3b64  5 Series/3400 Series Chipset HECI Controller
    	1025 0347  Aspire 7740G
    	15d9 060d  C7SIM-Q Motherboard
+		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
    	e4bf 50c1  PC1-GROOVE
    3b65  5 Series/3400 Series Chipset HECI Controller
    3b66  5 Series/3400 Series Chipset PT IDER Controller
@@ -23627,7 +24911,7 @@
    4222  PRO/Wireless 3945ABG [Golan] Network Connection
    	103c 135c  PRO/Wireless 3945ABG [Golan] Network Connection
    	8086 1000  PRO/Wireless 3945ABG Network Connection
-		8086 1001  PRO/Wireless 3945ABG Network Connection
+		8086 1001  WM3945ABG MOW2
    	8086 1005  PRO/Wireless 3945BG Network Connection
    	8086 1034  PRO/Wireless 3945BG Network Connection
    	8086 1044  PRO/Wireless 3945BG Network Connection
@@ -23778,6 +25062,167 @@
    65f9  5100 Chipset PCI Express x8 Port 6-7
    65fa  5100 Chipset PCI Express x16 Port 4-7
    65ff  5100 Chipset DMA Engine
+	6f00  Broadwell DMI2
+	6f01  Broadwell PCI Express Root Port 0
+	6f02  Broadwell PCI Express Root Port 1
+	6f03  Broadwell PCI Express Root Port 1
+	6f04  Broadwell PCI Express Root Port 2
+	6f05  Broadwell PCI Express Root Port 2
+	6f06  Broadwell PCI Express Root Port 2
+	6f07  Broadwell PCI Express Root Port 2
+	6f08  Broadwell PCI Express Root Port 3
+	6f09  Broadwell PCI Express Root Port 3
+	6f0a  Broadwell PCI Express Root Port 3
+	6f0b  Broadwell PCI Express Root Port 3
+	6f10  Broadwell IIO Debug
+	6f11  Broadwell IIO Debug
+	6f12  Broadwell IIO Debug
+	6f13  Broadwell IIO Debug
+	6f14  Broadwell IIO Debug
+	6f15  Broadwell IIO Debug
+	6f16  Broadwell IIO Debug
+	6f17  Broadwell IIO Debug
+	6f18  Broadwell IIO Debug
+	6f19  Broadwell IIO Debug
+	6f1a  Broadwell IIO Debug
+	6f1b  Broadwell IIO Debug
+	6f1c  Broadwell IIO Debug
+	6f1d  Broadwell R2PCIe Agent
+	6f1e  Broadwell Ubox
+	6f1f  Broadwell Ubox
+	6f20  Broadwell-DE Crystal Beach DMA Channel 0
+	6f21  Broadwell-DE Crystal Beach DMA Channel 1
+	6f22  Broadwell-DE Crystal Beach DMA Channel 2
+	6f23  Broadwell-DE Crystal Beach DMA Channel 3
+	6f24  Broadwell-DE Crystal Beach DMA Channel 4
+	6f25  Broadwell-DE Crystal Beach DMA Channel 5
+	6f26  Broadwell-DE Crystal Beach DMA Channel 6
+	6f27  Broadwell-DE Crystal Beach DMA Channel 7
+	6f28  Broadwell Adress Map/VTd_Misc/System Management
+	6f29  Broadwell IIO Hot Plug
+	6f2a  Broadwell IIO RAS/Control Status/Global Errors
+	6f2c  Broadwell I/O APIC
+	6f30  Broadwell Home Agent 0
+	6f32  Broadwell QPI Link 0
+	6f33  Broadwell QPI Link 1
+	6f34  Broadwell R2PCIe Agent
+	6f36  Broadwell R3 QPI Link 0/1
+	6f37  Broadwell R3 QPI Link 0/1
+	6f38  Broadwell Home Agent 1
+	6f39  Broadwell IO Performance Monitoring
+	6f3a  Broadwell QPI Link 2
+	6f3e  Broadwell R3 QPI Link 2
+	6f3f  Broadwell R3 QPI Link 2
+	6f40  Broadwell QPI Link 2
+	6f41  Broadwell R3 QPI Link 2
+	6f43  Broadwell QPI Link 2
+	6f45  Broadwell QPI Link 2 Debug
+	6f46  Broadwell QPI Link 2 Debug
+	6f47  Broadwell QPI Link 2 Debug
+	6f60  Broadwell Home Agent 1
+	6f68  Broadwell Target Address/Thermal/RAS
+	6f6a  Broadwell Channel Target Address Decoder
+	6f6b  Broadwell Channel Target Address Decoder
+	6f6c  Broadwell Channel Target Address Decoder
+	6f6d  Broadwell Channel Target Address Decoder
+	6f6e  Broadwell DDRIO Channel 2/3 Broadcast
+	6f6f  Broadwell DDRIO Global Broadcast
+	6f70  Broadwell Home Agent 0 Debug
+	6f71  Broadwell Memory Controller 0 - Target Address/Thermal/RAS
+	6f76  Broadwell R3 QPI Link Debug
+	6f78  Broadwell Home Agent 1 Debug
+	6f79  Broadwell Target Address/Thermal/RAS
+	6f7d  Broadwell Ubox
+	6f7e  Broadwell R3 QPI Link Debug
+	6f80  Broadwell QPI Link 0
+	6f81  Broadwell R3 QPI Link 0/1
+	6f83  Broadwell QPI Link 0
+	6f85  Broadwell QPI Link 0 Debug
+	6f86  Broadwell QPI Link 0 Debug
+	6f87  Broadwell QPI Link 0 Debug
+	6f88  Broadwell Power Control Unit
+	6f8a  Broadwell Power Control Unit
+	6f90  Broadwell QPI Link 1
+	6f93  Broadwell QPI Link 1
+	6f95  Broadwell QPI Link 1 Debug
+	6f96  Broadwell QPI Link 1 Debug
+	6f98  Broadwell Power Control Unit
+	6f99  Broadwell Power Control Unit
+	6f9a  Broadwell Power Control Unit
+	6f9c  Broadwell Power Control Unit
+	6fa0  Broadwell Home Agent 0
+	6fa8  Broadwell Memory Controller 0 - Target Address/Thermal/RAS
+	6faa  Broadwell Memory Controller 0 - Channel Target Address Decoder
+	6fab  Broadwell Memory Controller 0 - Channel Target Address Decoder
+	6fac  Broadwell Memory Controller 0 - Channel Target Address Decoder
+	6fad  Broadwell Memory Controller 0 - Channel Target Address Decoder
+	6fae  Broadwell DDRIO Channel 0/1 Broadcast
+	6faf  Broadwell DDRIO Global Broadcast
+	6fb0  Broadwell Memory Controller 0 - Channel 0 Thermal Control
+	6fb1  Broadwell Memory Controller 0 - Channel 1 Thermal Control
+	6fb2  Broadwell Memory Controller 0 - Channel 0 Error
+	6fb3  Broadwell Memory Controller 0 - Channel 1 Error
+	6fb4  Broadwell Memory Controller 0 - Channel 2 Thermal Control
+	6fb5  Broadwell Memory Controller 0 - Channel 3 Thermal Control
+	6fb6  Broadwell Memory Controller 0 - Channel 2 Error
+	6fb7  Broadwell Memory Controller 0 - Channel 3 Error
+	6fb8  Broadwell DDRIO Channel 2/3 Interface
+	6fb9  Broadwell DDRIO Channel 2/3 Interface
+	6fba  Broadwell DDRIO Channel 2/3 Interface
+	6fbb  Broadwell DDRIO Channel 2/3 Interface
+	6fbc  Broadwell DDRIO Channel 0/1 Interface
+	6fbd  Broadwell DDRIO Channel 0/1 Interface
+	6fbe  Broadwell DDRIO Channel 0/1 Interface
+	6fbf  Broadwell DDRIO Channel 0/1 Interface
+	6fc0  Broadwell Power Control Unit
+	6fc1  Broadwell Power Control Unit
+	6fc2  Broadwell Power Control Unit
+	6fc3  Broadwell Power Control Unit
+	6fc4  Broadwell Power Control Unit
+	6fc5  Broadwell Power Control Unit
+	6fc6  Broadwell Power Control Unit
+	6fc7  Broadwell Power Control Unit
+	6fc8  Broadwell Power Control Unit
+	6fc9  Broadwell Power Control Unit
+	6fca  Broadwell Power Control Unit
+	6fcb  Broadwell Power Control Unit
+	6fcc  Broadwell Power Control Unit
+	6fcd  Broadwell Power Control Unit
+	6fce  Broadwell Power Control Unit
+	6fcf  Broadwell Power Control Unit
+	6fd0  Broadwell Memory Controller 1 - Channel 0 Thermal Control
+	6fd1  Broadwell Memory Controller 1 - Channel 1 Thermal Control
+	6fd2  Broadwell Memory Controller 1 - Channel 0 Error
+	6fd3  Broadwell Memory Controller 1 - Channel 1 Error
+	6fd4  Broadwell Memory Controller 1 - Channel 2 Thermal Control
+	6fd5  Broadwell Memory Controller 1 - Channel 3 Thermal Control
+	6fd6  Broadwell Memory Controller 1 - Channel 2 Error
+	6fd7  Broadwell Memory Controller 1 - Channel 3 Error
+	6fe0  Broadwell Caching Agent
+	6fe1  Broadwell Caching Agent
+	6fe2  Broadwell Caching Agent
+	6fe3  Broadwell Caching Agent
+	6fe4  Broadwell Caching Agent
+	6fe5  Broadwell Caching Agent
+	6fe6  Broadwell Caching Agent
+	6fe7  Broadwell Caching Agent
+	6fe8  Broadwell Caching Agent
+	6fe9  Broadwell Caching Agent
+	6fea  Broadwell Caching Agent
+	6feb  Broadwell Caching Agent
+	6fec  Broadwell Caching Agent
+	6fed  Broadwell Caching Agent
+	6fee  Broadwell Caching Agent
+	6fef  Broadwell Caching Agent
+	6ff0  Broadwell Caching Agent
+	6ff1  Broadwell Caching Agent
+	6ff8  Broadwell Caching Agent
+	6ff9  Broadwell Caching Agent
+	6ffa  Broadwell Caching Agent
+	6ffb  Broadwell Caching Agent
+	6ffc  Broadwell Caching Agent
+	6ffd  Broadwell Caching Agent
+	6ffe  Broadwell Caching Agent
    7000  82371SB PIIX3 ISA [Natoma/Triton II]
    	1af4 1100  Qemu virtual machine
    7010  82371SB PIIX3 IDE [Natoma/Triton II]
@@ -24020,68 +25465,104 @@
    8c5d  8 Series/C220 Series Chipset Family LPC Controller
    8c5e  8 Series/C220 Series Chipset Family LPC Controller
    8c5f  8 Series/C220 Series Chipset Family LPC Controller
-	8d00  Wellsburg 4-port SATA Controller [IDE mode]
-	8d02  Wellsburg 6-Port SATA Controller [AHCI mode]
-	8d04  Wellsburg SATA Controller [RAID mode]
-	8d06  Wellsburg SATA Controller [RAID mode]
+	8c80  9 Series Chipset Family SATA Controller [IDE Mode]
+	8c81  9 Series Chipset Family SATA Controller [IDE Mode]
+	8c82  9 Series Chipset Family SATA Controller [AHCI Mode]
+	8c83  9 Series Chipset Family SATA Controller [AHCI Mode]
+	8c84  9 Series Chipset Family SATA Controller [RAID Mode]
+	8c85  9 Series Chipset Family SATA Controller [RAID Mode]
+	8c86  9 Series Chipset Family SATA Controller [RAID Mode]
+	8c87  9 Series Chipset Family SATA Controller [RAID Mode]
+	8c88  9 Series Chipset Family SATA Controller [IDE Mode]
+	8c89  9 Series Chipset Family SATA Controller [IDE Mode]
+	8c8e  9 Series Chipset Family SATA Controller [RAID Mode]
+	8c8f  9 Series Chipset Family SATA Controller [RAID Mode]
+	8c90  9 Series Chipset Family PCI Express Root Port 1
+	8c92  9 Series Chipset Family PCI Express Root Port 2
+	8c94  9 Series Chipset Family PCI Express Root Port 3
+	8c96  9 Series Chipset Family PCI Express Root Port 4
+	8c98  9 Series Chipset Family PCI Express Root Port 5
+	8c9a  9 Series Chipset Family PCI Express Root Port 6
+	8c9c  9 Series Chipset Family PCI Express Root Port 7
+	8c9e  9 Series Chipset Family PCI Express Root Port 8
+	8ca0  9 Series Chipset Family HD Audio Controller
+	8ca2  9 Series Chipset Family SMBus Controller
+	8ca4  9 Series Chipset Family Thermal Controller
+	8ca6  9 Series Chipset Family USB EHCI Controller #1
+	8cad  9 Series Chipset Family USB EHCI Controller #2
+	8cb1  9 Series Chipset Family USB xHCI Controller
+	8cb3  9 Series Chipset Family LAN Controller
+	8cba  9 Series Chipset Family ME Interface #1
+	8cbb  9 Series Chipset Family ME Interface #2
+	8cbc  9 Series Chipset Family IDE-R Controller
+	8cbd  9 Series Chipset Family KT Controller
+	8cc1  9 Series Chipset Family LPC Controller
+	8cc2  9 Series Chipset Family LPC Controller
+	8cc3  9 Series Chipset Family HM97 LPC Controller
+	8cc4  9 Series Chipset Family Z97 LPC Controller
+	8cc6  9 Series Chipset Family H97 Controller
+	8d00  C610/X99 series chipset 4-port SATA Controller [IDE mode]
+	8d02  C610/X99 series chipset 6-Port SATA Controller [AHCI mode]
+	8d04  C610/X99 series chipset SATA Controller [RAID mode]
+	8d06  C610/X99 series chipset SATA Controller [RAID mode]
    	17aa 1031  ThinkServer RAID 110i
-	8d08  Wellsburg 2-port SATA Controller [IDE mode]
-	8d0e  Wellsburg SATA Controller [RAID mode]
-	8d10  Wellsburg PCI Express Root Port #1
-	8d11  Wellsburg PCI Express Root Port #1
-	8d12  Wellsburg PCI Express Root Port #2
-	8d13  Wellsburg PCI Express Root Port #2
-	8d14  Wellsburg PCI Express Root Port #3
-	8d15  Wellsburg PCI Express Root Port #3
-	8d16  Wellsburg PCI Express Root Port #4
-	8d17  Wellsburg PCI Express Root Port #4
-	8d18  Wellsburg PCI Express Root Port #5
-	8d19  Wellsburg PCI Express Root Port #5
-	8d1a  Wellsburg PCI Express Root Port #6
-	8d1b  Wellsburg PCI Express Root Port #6
-	8d1c  Wellsburg PCI Express Root Port #7
-	8d1d  Wellsburg PCI Express Root Port #7
-	8d1e  Wellsburg PCI Express Root Port #8
-	8d1f  Wellsburg PCI Express Root Port #8
-	8d20  Wellsburg HD Audio Controller
-	8d21  Wellsburg HD Audio Controller
-	8d22  Wellsburg SMBus Controller
-	8d24  Wellsburg Thermal Subsystem
-	8d26  Wellsburg USB Enhanced Host Controller #1
-	8d2d  Wellsburg USB Enhanced Host Controller #2
-	8d31  Wellsburg USB xHCI Host Controller
-	8d33  Wellsburg LAN Controller
-	8d34  Wellsburg NAND Controller
-	8d3a  Wellsburg MEI Controller #1
-	8d3b  Wellsburg MEI Controller #2
-	8d3c  Wellsburg IDE-r Controller
-	8d3d  Wellsburg KT Controller
-	8d40  Wellsburg LPC Controller
-	8d41  Wellsburg LPC Controller
-	8d42  Wellsburg LPC Controller
-	8d43  Wellsburg LPC Controller
-	8d44  Wellsburg LPC Controller
-	8d45  Wellsburg LPC Controller
-	8d46  Wellsburg LPC Controller
-	8d47  Wellsburg LPC Controller
-	8d48  Wellsburg LPC Controller
-	8d49  Wellsburg LPC Controller
-	8d4a  Wellsburg LPC Controller
-	8d4b  Wellsburg LPC Controller
-	8d4c  Wellsburg LPC Controller
-	8d4d  Wellsburg LPC Controller
-	8d4e  Wellsburg LPC Controller
-	8d4f  Wellsburg LPC Controller
-	8d60  Wellsburg sSATA Controller [IDE mode]
-	8d62  Wellsburg sSATA Controller [AHCI mode]
-	8d64  Wellsburg sSATA Controller [RAID mode]
-	8d66  Wellsburg sSATA Controller [RAID mode]
-	8d68  Wellsburg sSATA Controller [IDE mode]
-	8d6e  Wellsburg sSATA Controller [RAID mode]
-	8d7c  Wellsburg SPSR
-	8d7d  Wellsburg MS SMBus 0
-	8d7e  Wellsburg MS SMBus 1
-	8d7f  Wellsburg MS SMBus 2
+	8d08  C610/X99 series chipset 2-port SATA Controller [IDE mode]
+	8d0e  C610/X99 series chipset SATA Controller [RAID mode]
+	8d10  C610/X99 series chipset PCI Express Root Port #1
+	8d11  C610/X99 series chipset PCI Express Root Port #1
+	8d12  C610/X99 series chipset PCI Express Root Port #2
+	8d13  C610/X99 series chipset PCI Express Root Port #2
+	8d14  C610/X99 series chipset PCI Express Root Port #3
+	8d15  C610/X99 series chipset PCI Express Root Port #3
+	8d16  C610/X99 series chipset PCI Express Root Port #4
+	8d17  C610/X99 series chipset PCI Express Root Port #4
+	8d18  C610/X99 series chipset PCI Express Root Port #5
+	8d19  C610/X99 series chipset PCI Express Root Port #5
+	8d1a  C610/X99 series chipset PCI Express Root Port #6
+	8d1b  C610/X99 series chipset PCI Express Root Port #6
+	8d1c  C610/X99 series chipset PCI Express Root Port #7
+	8d1d  C610/X99 series chipset PCI Express Root Port #7
+	8d1e  C610/X99 series chipset PCI Express Root Port #8
+	8d1f  C610/X99 series chipset PCI Express Root Port #8
+	8d20  C610/X99 series chipset HD Audio Controller
+	8d21  C610/X99 series chipset HD Audio Controller
+	8d22  C610/X99 series chipset SMBus Controller
+	8d24  C610/X99 series chipset Thermal Subsystem
+	8d26  C610/X99 series chipset USB Enhanced Host Controller #1
+	8d2d  C610/X99 series chipset USB Enhanced Host Controller #2
+	8d31  C610/X99 series chipset USB xHCI Host Controller
+	8d33  C610/X99 series chipset LAN Controller
+	8d34  C610/X99 series chipset NAND Controller
+	8d3a  C610/X99 series chipset MEI Controller #1
+	8d3b  C610/X99 series chipset MEI Controller #2
+	8d3c  C610/X99 series chipset IDE-r Controller
+	8d3d  C610/X99 series chipset KT Controller
+	8d40  C610/X99 series chipset LPC Controller
+	8d41  C610/X99 series chipset LPC Controller
+	8d42  C610/X99 series chipset LPC Controller
+	8d43  C610/X99 series chipset LPC Controller
+	8d44  C610/X99 series chipset LPC Controller
+	8d45  C610/X99 series chipset LPC Controller
+	8d46  C610/X99 series chipset LPC Controller
+	8d47  C610/X99 series chipset LPC Controller
+	8d48  C610/X99 series chipset LPC Controller
+	8d49  C610/X99 series chipset LPC Controller
+	8d4a  C610/X99 series chipset LPC Controller
+	8d4b  C610/X99 series chipset LPC Controller
+	8d4c  C610/X99 series chipset LPC Controller
+	8d4d  C610/X99 series chipset LPC Controller
+	8d4e  C610/X99 series chipset LPC Controller
+	8d4f  C610/X99 series chipset LPC Controller
+	8d60  C610/X99 series chipset sSATA Controller [IDE mode]
+	8d62  C610/X99 series chipset sSATA Controller [AHCI mode]
+	8d64  C610/X99 series chipset sSATA Controller [RAID mode]
+	8d66  C610/X99 series chipset sSATA Controller [RAID mode]
+	8d68  C610/X99 series chipset sSATA Controller [IDE mode]
+	8d6e  C610/X99 series chipset sSATA Controller [RAID mode]
+	8d7c  C610/X99 series chipset SPSR
+	8d7d  C610/X99 series chipset MS SMBus 0
+	8d7e  C610/X99 series chipset MS SMBus 1
+	8d7f  C610/X99 series chipset MS SMBus 2
    9000  IXP2000 Family Network Processor
    9001  IXP2400 Network Processor
    9002  IXP2300 Network Processor
@@ -24090,74 +25571,74 @@
    9622  Integrated RAID
    9641  Integrated RAID
    96a1  Integrated RAID
-	9c00  Lynx Point-LP SATA Controller 1 [IDE mode]
-	9c01  Lynx Point-LP SATA Controller 1 [IDE mode]
-	9c02  Lynx Point-LP SATA Controller 1 [AHCI mode]
-	9c03  Lynx Point-LP SATA Controller 1 [AHCI mode]
+	9c00  8 Series SATA Controller 1 [IDE mode]
+	9c01  8 Series SATA Controller 1 [IDE mode]
+	9c02  8 Series SATA Controller 1 [AHCI mode]
+	9c03  8 Series SATA Controller 1 [AHCI mode]
    	17aa 2214  ThinkPad X240
-	9c04  Lynx Point-LP SATA Controller 1 [RAID mode]
-	9c05  Lynx Point-LP SATA Controller 1 [RAID mode]
-	9c06  Lynx Point-LP SATA Controller 1 [RAID mode]
-	9c07  Lynx Point-LP SATA Controller 1 [RAID mode]
-	9c08  Lynx Point-LP SATA Controller 2 [IDE mode]
-	9c09  Lynx Point-LP SATA Controller 2 [IDE mode]
-	9c0a  LynxPoint-LP SATA Controller [Reserved]
-	9c0b  LynxPoint-LP SATA Controller [Reserved]
-	9c0c  LynxPoint-LP SATA Controller [Reserved]
-	9c0d  LynxPoint-LP SATA Controller [Reserved]
-	9c0e  Lynx Point-LP SATA Controller 1 [RAID mode]
-	9c0f  Lynx Point-LP SATA Controller 1 [RAID mode]
-	9c10  Lynx Point-LP PCI Express Root Port 1
-	9c11  Lynx Point-LP PCI Express Root Port 1
-	9c12  Lynx Point-LP PCI Express Root Port 2
-	9c13  Lynx Point-LP PCI Express Root Port 2
-	9c14  Lynx Point-LP PCI Express Root Port 3
-	9c15  Lynx Point-LP PCI Express Root Port 3
-	9c16  Lynx Point-LP PCI Express Root Port 4
-	9c17  Lynx Point-LP PCI Express Root Port 4
-	9c18  Lynx Point-LP PCI Express Root Port 5
-	9c19  Lynx Point-LP PCI Express Root Port 5
-	9c1a  Lynx Point-LP PCI Express Root Port 6
-	9c1b  Lynx Point-LP PCI Express Root Port 6
-	9c1c  Lynx Point-LP PCI Express Root Port 7
-	9c1d  Lynx Point-LP PCI Express Root Port 7
-	9c1e  Lynx Point-LP PCI Express Root Port 8
-	9c1f  Lynx Point-LP PCI Express Root Port 8
-	9c20  Lynx Point-LP HD Audio Controller
+	9c04  8 Series SATA Controller 1 [RAID mode]
+	9c05  8 Series SATA Controller 1 [RAID mode]
+	9c06  8 Series SATA Controller 1 [RAID mode]
+	9c07  8 Series SATA Controller 1 [RAID mode]
+	9c08  8 Series SATA Controller 2 [IDE mode]
+	9c09  8 Series SATA Controller 2 [IDE mode]
+	9c0a  8 Series SATA Controller [Reserved]
+	9c0b  8 Series SATA Controller [Reserved]
+	9c0c  8 Series SATA Controller [Reserved]
+	9c0d  8 Series SATA Controller [Reserved]
+	9c0e  8 Series SATA Controller 1 [RAID mode]
+	9c0f  8 Series SATA Controller 1 [RAID mode]
+	9c10  8 Series PCI Express Root Port 1
+	9c11  8 Series PCI Express Root Port 1
+	9c12  8 Series PCI Express Root Port 2
+	9c13  8 Series PCI Express Root Port 2
+	9c14  8 Series PCI Express Root Port 3
+	9c15  8 Series PCI Express Root Port 3
+	9c16  8 Series PCI Express Root Port 4
+	9c17  8 Series PCI Express Root Port 4
+	9c18  8 Series PCI Express Root Port 5
+	9c19  8 Series PCI Express Root Port 5
+	9c1a  8 Series PCI Express Root Port 6
+	9c1b  8 Series PCI Express Root Port 6
+	9c1c  8 Series PCI Express Root Port 7
+	9c1d  8 Series PCI Express Root Port 7
+	9c1e  8 Series PCI Express Root Port 8
+	9c1f  8 Series PCI Express Root Port 8
+	9c20  8 Series HD Audio Controller
    	17aa 2214  ThinkPad X240
-	9c21  Lynx Point-LP HD Audio Controller
-	9c22  Lynx Point-LP SMBus Controller
+	9c21  8 Series HD Audio Controller
+	9c22  8 Series SMBus Controller
    	17aa 2214  ThinkPad X240
-	9c23  Lynx Point-LP CHAP Counters
-	9c24  Lynx Point-LP Thermal
-	9c26  Lynx Point-LP USB EHCI #1
+	9c23  8 Series CHAP Counters
+	9c24  8 Series Thermal
+	9c26  8 Series USB EHCI #1
    	17aa 2214  ThinkPad X240
-	9c2d  Lynx Point-LP USB EHCI #2
-	9c31  Lynx Point-LP USB xHCI HC
+	9c2d  8 Series USB EHCI #2
+	9c31  8 Series USB xHCI HC
    	17aa 2214  ThinkPad X240
-	9c35  Lynx Point-LP SDIO Controller
-	9c36  Lynx Point-LP Audio DSP Controller
-	9c3a  Lynx Point-LP HECI #0
+	9c35  8 Series SDIO Controller
+	9c36  8 Series Audio DSP Controller
+	9c3a  8 Series HECI #0
    	17aa 2214  ThinkPad X240
-	9c3b  Lynx Point-LP HECI #1
-	9c3c  Lynx Point-LP HECI IDER
-	9c3d  Lynx Point-LP HECI KT
-	9c40  Lynx Point-LP LPC Controller
-	9c41  Lynx Point-LP LPC Controller
-	9c42  Lynx Point-LP LPC Controller
-	9c43  Lynx Point-LP LPC Controller
+	9c3b  8 Series HECI #1
+	9c3c  8 Series HECI IDER
+	9c3d  8 Series HECI KT
+	9c40  8 Series LPC Controller
+	9c41  8 Series LPC Controller
+	9c42  8 Series LPC Controller
+	9c43  8 Series LPC Controller
    	17aa 2214  ThinkPad X240
-	9c44  Lynx Point-LP LPC Controller
-	9c45  Lynx Point-LP LPC Controller
-	9c46  Lynx Point-LP LPC Controller
-	9c47  Lynx Point-LP LPC Controller
-	9c60  Lynx Point-LP Low Power Sub-System DMA
-	9c61  Lynx Point-LP I2C Controller #0
-	9c62  Lynx Point-LP I2C Controller #1
-	9c63  Lynx Point-LP UART Controller #0
-	9c64  Lynx Point-LP UART Controller #1
-	9c65  Lynx Point-LP SPI Controller #0
-	9c66  Lynx Point-LP SPI Controller #1
+	9c44  8 Series LPC Controller
+	9c45  8 Series LPC Controller
+	9c46  8 Series LPC Controller
+	9c47  8 Series LPC Controller
+	9c60  8 Series Low Power Sub-System DMA
+	9c61  8 Series I2C Controller #0
+	9c62  8 Series I2C Controller #1
+	9c63  8 Series UART Controller #0
+	9c64  8 Series UART Controller #1
+	9c65  8 Series SPI Controller #0
+	9c66  8 Series SPI Controller #1
    9c83  Wildcat Point-LP SATA Controller [AHCI Mode]
    9c85  Wildcat Point-LP SATA Controller [RAID Mode]
    9c87  Wildcat Point-LP SATA Controller [RAID Mode]
@@ -24210,6 +25691,87 @@
    a012  Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller
    	144d c072  Notebook N150P
    a013  Atom Processor D4xx/D5xx/N4xx/N5xx CHAPS counter
+	a103  Sunrise Point-H SATA Controller [AHCI mode]
+	a105  Sunrise Point-H SATA Controller [RAID mode]
+	a107  Sunrise Point-H SATA Controller [RAID mode]
+	a10f  Sunrise Point-H SATA Controller [RAID mode]
+	a110  Sunrise Point-H PCI Express Root Port #1
+	a111  Sunrise Point-H PCI Express Root Port #2
+	a112  Sunrise Point-H PCI Express Root Port #3
+	a113  Sunrise Point-H PCI Express Root Port #4
+	a114  Sunrise Point-H PCI Express Root Port #5
+	a115  Sunrise Point-H PCI Express Root Port #6
+	a116  Sunrise Point-H PCI Express Root Port #7
+	a117  Sunrise Point-H PCI Express Root Port #8
+	a118  Sunrise Point-H PCI Express Root Port #9
+	a119  Sunrise Point-H PCI Express Root Port #10
+	a11a  Sunrise Point-H PCI Express Root Port #11
+	a11b  Sunrise Point-H PCI Express Root Port #12
+	a11c  Sunrise Point-H PCI Express Root Port #13
+	a11d  Sunrise Point-H PCI Express Root Port #14
+	a11e  Sunrise Point-H PCI Express Root Port #15
+	a11f  Sunrise Point-H PCI Express Root Port #16
+	a120  Sunrise Point-H P2SB
+	a121  Sunrise Point-H PMC
+	a122  Sunrise Point-H cAVS
+	a123  Sunrise Point-H SMBus
+	a124  Sunrise Point-H SPI Controller
+	a125  Sunrise Point-H Gigabit Ethernet Controller
+	a126  Sunrise Point-H Northpeak
+	a127  Sunrise Point-H LPSS UART #0
+	a128  Sunrise Point-H LPSS UART #1
+	a129  Sunrise Point-H LPSS SPI #0
+	a12a  Sunrise Point-H LPSS SPI #1
+	a12f  Sunrise Point-H USB 3.0 xHCI Controller
+	a130  Sunrise Point-H USB Device Controller (OTG)
+	a131  Sunrise Point-H Thermal subsystem
+	a133  Sunrise Point-H Northpeak ACPI Function
+	a135  Sunrise Point-H Integrated Sensor Hub
+	a13a  Sunrise Point-H CSME HECI #1
+	a13b  Sunrise Point-H CSME HECI #2
+	a13c  Sunrise Point-H CSME IDE Redirection
+	a13d  Sunrise Point-H KT Redirection
+	a13e  Sunrise Point-H CSME HECI #3
+	a140  Sunrise Point-H LPC Controller
+	a141  Sunrise Point-H LPC Controller
+	a142  Sunrise Point-H LPC Controller
+	a143  Sunrise Point-H LPC Controller
+	a144  Sunrise Point-H LPC Controller
+	a145  Sunrise Point-H LPC Controller
+	a146  Sunrise Point-H LPC Controller
+	a147  Sunrise Point-H LPC Controller
+	a148  Sunrise Point-H LPC Controller
+	a149  Sunrise Point-H LPC Controller
+	a14a  Sunrise Point-H LPC Controller
+	a14b  Sunrise Point-H LPC Controller
+	a14c  Sunrise Point-H LPC Controller
+	a14d  Sunrise Point-H LPC Controller
+	a14e  Sunrise Point-H LPC Controller
+	a14f  Sunrise Point-H LPC Controller
+	a150  Sunrise Point-H LPC Controller
+	a151  Sunrise Point-H LPC Controller
+	a152  Sunrise Point-H LPC Controller
+	a153  Sunrise Point-H LPC Controller
+	a154  Sunrise Point-H LPC Controller
+	a155  Sunrise Point-H LPC Controller
+	a156  Sunrise Point-H LPC Controller
+	a157  Sunrise Point-H LPC Controller
+	a158  Sunrise Point-H LPC Controller
+	a159  Sunrise Point-H LPC Controller
+	a15a  Sunrise Point-H LPC Controller
+	a15b  Sunrise Point-H LPC Controller
+	a15c  Sunrise Point-H LPC Controller
+	a15d  Sunrise Point-H LPC Controller
+	a15e  Sunrise Point-H LPC Controller
+	a15f  Sunrise Point-H LPC Controller
+	a160  Sunrise Point-H LPSS I2C Controller #0
+	a161  Sunrise Point-H LPSS I2C Controller #1
+	a166  Sunrise Point-H LPSS UART Controller #2
+	a167  Sunrise Point-H PCI Root Port #17
+	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
@@ -24739,6 +26301,7 @@ bdbd  Blackmagic Design
    a11c  DeckLink HD Extreme 3
    a11d  DeckLink Studio
    a11e  DeckLink Optical Fibre
+	a120  Decklink Studio 2
    a121  DeckLink HD Extreme 3D/3D+
    a124  Intensity Extreme
    a126  Intensity Shuttle
@@ -24750,6 +26313,7 @@ bdbd  Blackmagic Design
    a12f  DeckLink Mini Monitor
    a130  DeckLink Mini Recorder
    a132  UltraStudio 4K
+	a138  Decklink SDI 4K
 c001  TSI Telsys
 c0a9  Micron/Crucial Technology
 c0de  Motorola
@@ -24781,7 +26345,9 @@ d161  Digium, Inc.
    1205  Wildcard TE205P/TE207P dual-span T1/E1/J1 card 5.0V (u1)
    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)
+	1410  Wildcard TE410P quad-span T1/E1/J1 card 3.3V (5th Gen)
    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)
@@ -24795,6 +26361,12 @@ 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
+	800c  Wildcard A8A 8-port analog card
+	800d  Wildcard A8B 8-port analog card (PCI-Express)
+	800e  Wildcard TE235/TE435 quad-span T1/E1/J1 card (PCI-Express)
+	800f  Wildcard A4A 4-port analog card
+	8010  Wildcard A4B 4-port analog card (PCI-Express)
+	8013  Wildcard TE236/TE436 quad-span T1/E1/J1 card
    b410  Wildcard B410 quad-BRI card
 d4d4  Dy4 Systems Inc
    0601  PCI Mezzanine Card
@@ -24934,7 +26506,11 @@ eace  Endace Measurement Systems, Ltd
    820f  DAG 8.2X 10G Ethernet (2nd bus)
    8400  DAG 8.4I Infiniband x4 SDR
    8500  DAG 8.5I Infiniband x4 DDR
+	9200  DAG 9.2SX2 10G Ethernet
    920e  DAG 9.2X2 10G Ethernet
+	a120  DAG 10X2-P 10G Ethernet
+	a12e  DAG 10X2-S 10G Ethernet
+	a140  DAG 10X4-P 10G Ethernet
 ec80  Belkin Corporation
    ec00  F5D6000
 ecc0  Echo Digital Audio Corporation
@@ -24951,6 +26527,7 @@ f1d0  AJA Video
    c0ff  Kona/Xena 2
    cafe  Kona SD
    cfee  Xena LS/SD-22-DA/SD-DA
+	daff  KONA LHi
    dcaf  Kona HD
    dfee  Xena HD-DA
    efac  Xena SD-MM/SD-22-MM
@@ -24998,8 +26575,12 @@ C 01  Mass storage controller
    06  SATA controller
    	00  Vendor specific
    	01  AHCI 1.0
+		02  Serial Storage Bus
    07  Serial Attached SCSI controller
+		01  Serial Storage Bus
    08  Non-Volatile memory controller
+		01  NVMHCI
+		02  NVM Express
    80  Mass storage controller
 C 02  Network controller
    00  Ethernet controller
@@ -25009,6 +26590,7 @@ C 02  Network controller
    04  ISDN controller
    05  WorldFip controller
    06  PICMG controller
+	07  Infiniband controller
    80  Network controller
 C 03  Display controller
    00  VGA compatible controller
@@ -25086,6 +26668,7 @@ C 08  Generic system peripheral
    	00  8254
    	01  ISA Timer
    	02  EISA Timers
+		03  HPET
    03  RTC
    	00  Generic
    	01  ISA RTC
@@ -25158,4 +26741,7 @@ C 11  Signal processing controller
    10  Communication synchronizer
    20  Signal processing management
    80  Signal processing controller
+C 12  Processing accelerators
+	00  Processing accelerators
+C 13  Non-Essential Instrumentation
 C ff  Unassigned class
diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids
index c8a83c8..e44dfa3 100644
--- a/src/hwdata/usb.ids
+++ b/src/hwdata/usb.ids
@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2014.02.03
-# Date:    2014-02-03 20:34:03
+# Version: 2015.02.03
+# Date:    2015-02-03 20:34:06
 #
# Vendors, devices and interfaces. Please keep sorted.
@@ -21,12 +21,11 @@
 #		interface  interface_name		<-- two tabs
0001  Fry's Electronics
-	142b  Arbiter Systems, Inc.
    7778  Counterfeit flash drive [Kingston]
 0002  Ingram
 0003  Club Mac
 0004  Nebraska Furniture Mart
-0011  Unknown manufacturer
+0011  Unknown
    7788  Flash mass storage drive
 0053  Planex
    5301  GW-US54ZGL 802.11bg
@@ -35,6 +34,8 @@
    0011  Gamepad
 0105  Trust International B.V.
    145f  NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]
+0127  IBP
+	0002  HDM Interface
 0145  Unknown
    0112  Card Reader
 017c  MLK
@@ -111,9 +112,13 @@
    210d  XPLAIN evaluation kit (CDC ACM)
    2110  AVR JTAGICE3 Debugger and Programmer
    2122  XMEGA-A1 Explained evaluation kit
+	2141  ICE debugger
    2310  EVK11xx evaluation board
    2fe4  ATxmega32A4U DFU bootloader
+	2fe6  Cactus V6 (DFU)
+	2fea  Cactus RF60 (DFU)
    2ff0  atmega32u2 DFU bootloader
+	2ff4  atmega32u4 DFU bootloader
    2ffa  at90usb162 DFU bootloader
    2ffb  at90usb AVR DFU bootloader
    2ffd  at89c5130/c5131 DFU bootloader
@@ -171,6 +176,7 @@
    011d  Bluetooth 1.2 Interface [Broadcom BCM2035]
    0121  HP49g+ Calculator
    0122  HID Internet Keyboard
+	0139  Barcode Scanner 4430
    0201  ScanJet 6200c
    0202  PhotoSmart S20
    0204  DeskJet 815c
@@ -181,6 +187,7 @@
    0212  DeskJet 1220C
    0217  LaserJet 2200
    0218  APOLLO P2500/2600
+	0241  Link-5 micro dongle
    0304  DeskJet 810c/812c
    0305  ScanJet 4300c
    0307  CD-Writer+ CD-4e
@@ -189,6 +196,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
@@ -243,6 +251,7 @@
    0f11  OfficeJet V40
    0f12  Printing Support
    0f17  LaserJet 1150
+	0f2a  LaserJet 400 color M451dn
    1001  Photo Scanner 1000
    1002  PhotoSmart 140 series
    1004  DeskJet 970c/970cse
@@ -270,6 +279,7 @@
    1312  DeskJet 460
    1317  LaserJet 1005
    1327  iLO Virtual Hub
+	134a  Optical Mouse
    1405  ScanJet 3670
    1411  PSC 750
    1424  f2105 Monitor Hub
@@ -280,6 +290,7 @@
    1512  Printing Support
    1517  color LaserJet 3500
    1524  Smart Card Keyboard - KR
+	1539  Mini Magnetic Stripe Reader
    1602  PhotoSmart 330 series
    1604  DeskJet 940c
    1605  ScanJet 5530C PhotoSmart
@@ -317,6 +328,7 @@
    1c17  Color LaserJet 2550l
    1d02  PhotoSmart A310 series
    1d17  LaserJet 1320
+	1d24  Barcode scanner
    1e02  PhotoSmart A320 Printer series
    1e11  PSC-950
    1e17  LaserJet 1160 series
@@ -331,6 +343,7 @@
    2005  ScanJet 3570c
    2012  OfficeJet Pro K5400
    201d  un2400 Gobi Wireless Modem (QDL mode)
+	2039  Cashdrawer
    2102  PhotoSmart 7345
    2104  DeskJet 630c
    2112  OfficeJet Pro L7500
@@ -355,7 +368,7 @@
    2502  PhotoSmart 7700 series
    2504  DeskJet F4200 series
    2505  ScanJet 3770
-	2512  OfficeJet Pro L7300
+	2512  OfficeJet Pro L7300 / Compaq LA2405 series monitor
    2514  4-port hub
    2517  LaserJet 2410
    251d  Gobi 2000 Wireless Modem
@@ -368,6 +381,8 @@
    2702  PhotoSmart A620 series
    2704  DeskJet 915
    2717  Color LaserJet 2830
+	2724  Magnetic Stripe Reader IDRA-334133-HP
+	2805  Scanjet G2710
    2811  PSC-2100
    2817  Color LaserJet 2840
    2902  PhotoSmart A820 series
@@ -424,6 +439,7 @@
    3807  c485w Flash Drive
    3817  LaserJet P2015 series
    3902  PhotoSmart 130
+	3912  Officejet Pro 8500
    3a02  PhotoSmart 7150
    3a11  OfficeJet 5500 series
    3a17  Printing Support
@@ -494,6 +510,7 @@
    5811  PhotoSmart C5100 series
    5817  LaserJet M1319f MFP
    5911  PhotoSmart C6180
+	5912  Officejet Pro 8600
    5a11  PhotoSmart C7100 series
    5b11  OfficeJet J2100 series
    5c11  PhotoSmart C4200 Printer series
@@ -530,6 +547,7 @@
    6a17  LaserJet 4240
    6b02  PhotoSmart R707 (PTP mode)
    6b11  Photosmart C4500 series
+	6c11  Photosmart C4480
    6c17  Color LaserJet 4610
    6f17  Color LaserJet CP6015 series
    7004  DeskJet 3320c
@@ -618,6 +636,7 @@
    bef4  NEC Picty760
    c002  PhotoSmart 7800 series
    c102  PhotoSmart 8000 series
+	c111  Deskjet 1510
    c202  PhotoSmart 8200 series
    c302  DeskJet D2300
    c402  PhotoSmart D5100 series
@@ -657,6 +676,7 @@
 03fb  OPTi, Inc.
 03fc  Elitegroup Computer Systems
 03fd  Xilinx, Inc.
+	0008  Platform Cable USB II
 03fe  Farallon Comunications
 0400  National Semiconductor Corp.
    05dc  Rigol Technologies DS1000USB Oscilloscope
@@ -687,9 +707,10 @@
    5667  M5667 MP3 player
    9665  Gateway Webcam
 0403  Future Technology Devices International, Ltd
-	0000  H4SMK 7 Port Hub
+	0000  H4SMK 7 Port Hub / Bricked Counterfeit FT232 Serial (UART) IC
    0232  Serial Converter
    1060  JTAG adapter
+	1234  IronLogic RFID Adapter [Z-2 USB]
    6001  FT232 USB-Serial (UART) IC
    6002  Lumel PD12
    6007  Serial Converter
@@ -714,12 +735,15 @@
    8b2a  Alpermann+Velte Rubidium Q1
    8b2b  Alpermann+Velte TCD
    8b2c  Alpermann+Velte TCC70
+	9132  LCD and Temperature Interface
    9133  CallerID
    9135  Rotary Pub alarm
+	9136  Pulsecounter
    9e90  Marvell OpenRD Base/Client
    9f80  Ewert Energy Systems CANdapter
    a6d0  Texas Instruments XDS100v2 JTAG / BeagleBone A3
    a951  HCP HIT GSM/GPRS modem [Cinterion MC55i]
+	a9a0  FT2232D - Dual UART/FIFO IC - FTDI
    abb8  Lego Mindstorms NXTCam
    b810  US Interface Navigator (CAT and 2nd PTT lines)
    b811  US Interface Navigator (WKEY and FSK lines)
@@ -757,6 +781,14 @@
    d011  SCS Position-Tracker/TNC
    d012  SCS DRAGON 1
    d013  SCS DRAGON 1
+	d388  Xsens converter
+	d389  Xsens Wireless Receiver
+	d38a  Xsens serial converter
+	d38b  Xsens serial converter
+	d38c  Xsens Wireless Receiver
+	d38d  Xsens Awinda Station
+	d38e  Xsens serial converter
+	d38f  Xsens serial converter
    d491  Zolix Omni 1509 monochromator
    d578  Accesio USB-COM-4SM
    d6f8  UNI Black BOX
@@ -764,6 +796,7 @@
    d739  Propox ISPcable III
    d9a9  Actisense USG-1 NMEA Serial Gateway
    d9aa  Actisense NGT-1 NMEA2000 PC Interface
+	daf4  Qundis Serial Infrared Head
    e0d0  Total Phase Aardvark I2C/SPI Host Adapter
    e521  EVER Sinline XL Series UPS
    e6c8  PYRAMID Computer GmbH LCD
@@ -777,12 +810,16 @@
    e8d8  Aaronia AG Spectran Spectrum Analyzer
    e8dc  Aaronia AG UBBV Preamplifier
    ea90  Eclo 1-Wire Adapter
+	ecd9  miControl miCan-Stick
    ed71  HAMEG HO870 Serial Port
    ed72  HAMEG HO720 Serial Port
    ed73  HAMEG HO730 Serial Port
    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
    f3c0  4N-GALAXY Serial Converter
@@ -884,6 +921,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
@@ -1019,6 +1057,7 @@
    4000  InkJet Color Printer
    4021  Photo Printer 6800
    4022  1400 Digital Photo Printer
+	402b  Photo Printer 6850
    402e  605 Photo Printer
    4034  805 Photo Printer
    4056  ESP 7200 Series AiO
@@ -1475,10 +1514,13 @@
    2524  USB MultiSwitch Hub
    2602  USB 2.0 Hub
    2640  USB 2.0 Hub
+	2660  Hub
    4060  Ultra Fast Media Reader
    4064  Ultra Fast Media Reader
+	5434  Hub
    7500  LAN7500 Ethernet 10/100/1000 Adapter
    9512  SMC9512/9514 USB Hub
+	9514  SMC9514 Hub
    a700  2 Port Hub
    ec00  SMSC9512/9514 Fast Ethernet Adapter
 0425  Motorola Semiconductors HK, Ltd
@@ -1759,6 +1801,7 @@
    2036  TUSB2036 Hub
    2046  TUSB2046 Hub
    2077  TUSB2077 Hub
+	2f90  SM-USB-DIG
    3410  TUSB3410 Microcontroller
    3f00  OMAP1610
    3f02  SMC WSKP100 Wi-Fi Phone
@@ -1782,6 +1825,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
@@ -1794,7 +1838,7 @@
    0150  Super Talent 1GB Flash Drive
    0151  Super Flash 1GB / GXT  64MB Flash Drive
    0162  SiS162 usb Wireless LAN Adapter
-	0163  802.11 Wireless LAN Adapter
+	0163  SiS163U 802.11 Wireless LAN Adapter
    0817  SiS-184-ASUS-4352.17 touch panel
    5401  Wireless Adapter RO80211GS-USB
 0458  KYE Systems Corp. (Mouse Systems)
@@ -1864,6 +1908,7 @@
    4012  TVGo DVB-T03 [AF9015]
    5003  G-pen 560 Tablet
    5004  G-pen Tablet
+	505e  Genius iSlim 330
    6001  GF3000F Ethernet Adapter
    7004  VideoCAM Express V2
    7006  Dsc 1.3 Smart Camera Device
@@ -1886,9 +1931,17 @@
    7055  Slim 2020AF camera
    705a  Asus USB2.0 Webcam
    705c  Genius iSlim 1300AF
+	7061  Genius iLook 1321 V2
+	7066  Acer Crystal Eye Webcam
+	7067  Genius iSlim 1300AF V2
+	7068  Genius eFace 1325R
+	706d  Genius iSlim 2000AF V2
+	7076  Genius FaceCam 312
    7079  FaceCam 2025R
    707f  TVGo DVB-T03 [RTL2832]
    7088  WideCam 1050
+	7089  Genius FaceCam 320
+	708c  Genius WideCam F100
 0459  Adobe Systems, Inc.
 045a  SONICblue, Inc.
    07da  Supra Express 56K modem
@@ -2025,6 +2078,11 @@
    02ae  Xbox NUI Camera
    02b0  Xbox NUI Motor
    02b6  Xbox 360 / Bluetooth Wireless Headset
+	02be  Kinect for Windows NUI Audio
+	02bf  Kinect for Windows NUI Camera
+	02c2  Kinect for Windows NUI Motor
+	02d1  XBOX One Controller for Windows
+	02d5  Xbox One Digital TV Tuner
    0400  Windows Powered Pocket PC 2002
    0401  Windows Powered Pocket PC 2002
    0402  Windows Powered Pocket PC 2002
@@ -2158,6 +2216,7 @@
    0707  Wireless Laser Mouse 8000
    0708  Transceiver v 3.0 for Bluetooth
    070a  Charon Bluetooth Dongle (DFU)
+	070f  LifeChat LX-3000 Headset
    0710  Zune Media Player
    0713  Wireless Presenter Mouse 8000
    0719  Xbox 360 Wireless Adapter
@@ -2165,6 +2224,7 @@
    0721  LifeCam NX-3000 (UVC-compliant)
    0723  LifeCam VX-7000 (UVC-compliant)
    0724  SideWinder Mouse
+	0728  LifeCam VX-5000
    0730  Digital Media Keyboard 3000
    0734  Wireless Optical Desktop 700
    0736  Sidewinder X5 Mouse
@@ -2181,6 +2241,7 @@
    0779  LifeCam HD-3000
    0780  Comfort Curve Keyboard 3000
    0797  Optical Mouse 200
+	07f8  Wired Keyboard 600 (model 1576)
    930a  ISOUSB.SYS Intel 82930 Isochronous IO Test Board
    ffca  Catalina
    fff8  Keyboard
@@ -2304,10 +2365,14 @@
    0820  QuickCam VC
    0821  HD Webcam C910
    0825  Webcam C270
+	0826  HD Webcam C525
    0828  HD Webcam B990
+	082b  Webcam C170
    082d  HD Pro Webcam C920
    0830  QuickClip
+	0837  BCC950 ConferenceCam
    0840  QuickCam Express
+	0843  Webcam C930e
    0850  QuickCam Web
    0870  QuickCam Express
    0890  QuickCam Traveler
@@ -2409,6 +2474,9 @@
    0a17  G330 Headset
    0a1f  G930
    0a29  H600 [Wireless Headset]
+	0a38  Headset H340
+	0a44  Wired headset
+	0a4d  G430 Surround Sound Gaming Headset
    0b02  C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
    8801  Video Camera
    b305  BT Mini-Receiver
@@ -2475,7 +2543,7 @@
    c064  M110 corded optical mouse (M-B0001)
    c066  G9x Laser Mouse
    c068  G500 Laser Mouse
-	c069  M500 Laser Mouse
+	c069  M-U0007 [Corded Mouse M500]
    c06a  USB Optical Mouse
    c06b  G700 Wireless Gaming Mouse
    c06c  Optical Mouse
@@ -2490,7 +2558,8 @@
    c124  Harmony 300 Remote
    c125  Harmony 200 Remote
    c126  Harmony Link
-	c12b  Harmony Touch Remote
+	c129  Harmony Hub
+	c12b  Harmony Touch/Ultimate Remote
    c201  WingMan Extreme Joystick with Throttle
    c202  WingMan Formula
    c207  WingMan Extreme Digital 3D
@@ -2530,6 +2599,7 @@
    c246  Gaming Mouse G300
    c248  G105 Gaming Keyboard
    c24a  G600 Gaming Mouse
+	c24c  G400s Optical Mouse
    c24d  G710 Gaming Keyboard
    c24e  G500s Laser Gaming Mouse
    c281  WingMan Force
@@ -2569,7 +2639,7 @@
    c318  Illuminated Keyboard
    c31a  Comfort Wave 450
    c31b  Compact Keyboard K300
-	c31c  Keyboard K120 for Business
+	c31c  Keyboard K120
    c31d  Media Keyboard K200
    c401  TrackMan Marble Wheel
    c402  Marble Mouse (2-button)
@@ -2603,14 +2673,23 @@
    c526  Nano Receiver
    c529  Logitech Keyboard + Mice
    c52b  Unifying Receiver
+	c52d  R700 Remote Presenter receiver
    c52e  MK260 Wireless Combo Receiver
    c52f  Unifying Receiver
    c532  Unifying Receiver
+	c534  Unifying Receiver
+	c603  3Dconnexion Spacemouse Plus XT
+	c605  3Dconnexion CADman
+	c606  3Dconnexion Spacemouse Classic
+	c621  3Dconnexion Spaceball 5000
    c623  3Dconnexion Space Traveller 3D Mouse
    c625  3Dconnexion Space Pilot 3D Mouse
    c626  3Dconnexion Space Navigator 3D Mouse
    c627  3Dconnexion Space Explorer 3D Mouse
+	c628  3Dconnexion Space Navigator for Notebooks
    c629  3Dconnexion SpacePilot Pro 3D Mouse
+	c62b  3Dconnexion Space Mouse Pro
+	c640  NuLOOQ navigator
    c702  Cordless Presenter
    c703  Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth)
    c704  diNovo Wireless Desktop
@@ -2648,6 +2727,7 @@
    5308  KeyMaestro Keyboard
    5408  KeyMaestro Multimedia Keyboard/Hub
    5500  Portable Keyboard 86+9 keys (Model 6100C US)
+	5550  5 button optical mouse model M873U
    5720  Smart Card Reader
    6782  BTC 7932 mouse+keyboard
 046f  Crystal Semiconductor
@@ -2792,6 +2872,7 @@
    1000  Trust Office Scan USB 19200
    1002  HP ScanJet 4300c Parallel Port
 047c  Dell Computer Corp.
+	ffff  UPS Tower 500W LV
 047d  Kensington
    1001  Mouse*in*a*Box
    1002  Expert Mouse Pro
@@ -2889,10 +2970,15 @@
    0004  InTouch Module
    0011  InTouch Module
    0014  InTouch Module
+	0100  Stor.E Slim USB 3.0
+	0200  External Disk
    a006  External Disk 1.5TB
    a007  External Disk USB 3.0
    a009  Stor.E Basics
+	a00d  STOR.E BASICS 500GB
+	b001  Stor.E Partner
    d010  External Disk 3TB
+	d011  Canvio Desk
 0481  Zenith Data Systems
 0482  Kyocera Corp.
    000e  FS-1020D Printer
@@ -2957,6 +3043,7 @@
    9006  IT9135 BDA Afatech DVB-T HDTV Dongle
    9009  Zolid HD DVD Maker
    9135  Zolid Mini DVB-T Stick
+	9306  IT930x DVB stick
    9503  ITE it9503 feature-limited DVB-T transmission chip [ccHDtv]
    9507  ITE it9507 full featured DVB-T transmission chip [ccHDtv]
 048f  Eicon Tech.
@@ -3337,6 +3424,7 @@
    1907  CanoScan LiDE 700F
    1909  CanoScan LiDE 110
    190a  CanoScan LiDE 210
+	190d  CanoScan 9000F Mark II
    2200  CanoScan LiDE 25
    2201  CanoScan FB320U
    2202  CanoScan FB620U
@@ -3367,6 +3455,7 @@
    2224  CanoScan LiDE 600F
    2225  CanoScan LiDE 70
    2228  CanoScan 4400F
+	2229  CanoScan 8600F
    2602  MultiPASS C555
    2603  MultiPASS C755
    260a  CAPT Printer
@@ -3451,6 +3540,7 @@
    26b5  MF4200 series
    26da  LBP3010B printer
    26e6  iR1024
+	2736  I-SENSYS MF4550d
    2737  MF4410
    3041  PowerShot S10
    3042  CanoScan FS4000US Film Scanner
@@ -3626,6 +3716,7 @@
    3195  PowerShot SX1 IS
    3196  PowerShot SD880 IS DIGITAL ELPH / Digital IXUS 870 IS / IXY DIGITAL 920 IS
    319a  EOS 7D
+	319b  EOS 50D
    31aa  SELPHY CP770
    31ab  SELPHY CP760
    31ad  PowerShot E1
@@ -3682,6 +3773,7 @@
    322c  PowerShot SX220 HS
    3233  PowerShot G1 X
    3234  PowerShot SX150 IS
+	3235  PowerShot ELPH 510 HS / IXUS 1100 HS
    3236  PowerShot S100
    3237  PowerShot ELPH 310 HS / IXUS 230 HS
    3238  PowerShot SX40 HS
@@ -3705,16 +3797,33 @@
    325a  PowerShot SX160 IS
    325b  PowerShot S110
    325c  PowerShot SX500 IS
+	325e  PowerShot N
    325f  PowerShot SX280 HS
    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
+	3266  Powershot ELPH 120 IS / IXUS 135
    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
+	3285  PowerShot SX700 HS
+	3286  PowerShot SX600 HS
+	3287  PowerShot ELPH 140 IS / IXUS 150
+	3288  Powershot ELPH 135 / IXUS 145
+	3289  PowerShot ELPH 340 HS / IXUS 265 HS
+	328a  PowerShot ELPH 150 IS / IXUS 155
+	328b  PowerShot N Facebook(R) Ready
+	329a  PowerShot SX60 HS
+	329b  PowerShot SX520 HS
+	329c  PowerShot SX400 IS
 04aa  DaeWoo Telecom, Ltd
 04ab  Chromatic Research
 04ac  Micro Audiometrics Corp.
@@ -3802,6 +3911,7 @@
    300a  Rapid Access IIIe Keyboard
    3016  UltraNav Keyboard Hub
    3018  UltraNav Keyboard
+	301a  2-port low-power hub
    301b  SK-8815 Keyboard
    301c  Enhanced Performance Keyboard
    3020  Enhanced Performance Keyboard
@@ -3817,6 +3927,7 @@
    310c  Wheel Mouse
    4427  Portable CD ROM
    4482  Serial Converter
+	4484  SMSC USB20H04 3-Port Hub [ThinkPad X4 UltraBase, Wistron S Note-3 Media Slice]
    4485  Serial Converter
    4524  40 Character Vacuum Fluorescent Display
    4525  Double sided CRT
@@ -3843,6 +3954,8 @@
    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)
    4616  Flash Disk (TPP)
@@ -4155,6 +4268,7 @@
    1097  fi-5110C
    10ae  fi-4120C2
    10af  fi-4220C2
+	10c7  fi-60f scanner
    10e0  fi-5120c Scanner
    10e1  fi-5220C
    10e7  fi-5900C
@@ -4177,6 +4291,7 @@
    004f  SK-9020 keyboard
    1766  HID Monitor Controls
    2004  Bluetooth 4.0 [Broadcom BCM20702A0]
+	7025  HP HD Webcam
    9304  Hub
    f01c  TT1280DA DVB-T TV Tuner
 04cb  Fuji Photo Film Co., Ltd
@@ -4317,6 +4432,7 @@
    0033  PICkit2
    0036  PICkit Serial Analyzer
    00e0  PIC32 Starter Board
+	04cd  28Cxxx EEPROM Programmer
    0a04  AGP LIN Serial Analyzer
    8000  In-Circuit Debugger
    8001  ICD2 in-circuit debugger
@@ -4325,12 +4441,17 @@
    9004  Microchip REAL ICE
    900a  PICkit3
    c001  PicoLCD 20x4
+	e11c  TL866CS EEPROM Programmer [MiniPRO]
+	f437  SBE Tech Ultrasonic Anemometer
+	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.
@@ -4346,7 +4467,7 @@
    2221  Keyboard
    2323  Keyboard
    2519  Shenzhen LogoTech 2.4GHz receiver
-	2832  1channel Telephone line recorder
+	2832  HT82A832R Audio MCU
    2834  HT82A834R Audio MCU
    a055  Keyboard
 04da  Panasonic (Matsushita)
@@ -4376,6 +4497,7 @@
    2372  Lumix Camera (Storage mode)
    2374  Lumix Camera (PTP mode)
    2451  HDC-SD9
+	245b  HC-X920K (3MOS Full HD video camcorder)
    2497  HDC-TM700
    250c  Gobi Wireless Modem (QDL mode)
    250d  Gobi Wireless Modem
@@ -4531,6 +4653,7 @@
    1003  MP3 Player and Recorder
    1006  SDC-200Z
    130c  NX100
+	1f05  S2 Portable [JMicron] (500GB)
    1f06  HX-MU064DA portable harddisk
    2018  WIS09ABGN LinkStick Wireless LAN Adapter
    2035  Digital Photo Frame Mass Storage
@@ -4576,6 +4699,7 @@
    330c  ML-1865
    3310  ML-331x Series Laser Printer
    3315  ML-2540 Series Laser Printer
+	331e  M262x/M282x Xpress Series Laser Printer
    3409  SCX-4216F Scanner
    340c  SCX-5x15 series
    340d  SCX-6x20 series
@@ -4592,6 +4716,7 @@
    341f  Composite Device
    3420  Composite Device
    3426  SCX-4500 Laser Printer
+	342d  SCX-4x28 Series
    344f  SCX-3400 Series
    3605  InkJet Color Printer
    3606  InkJet Color Printer
@@ -4664,9 +4789,11 @@
    5f04  NEXiO Sync
    5f05  STORY Station 1TB
    6032  G2 Portable hard drive
+	6033  G2 Portable device
    6034  G2 Portable hard drive
    60b3  M2 Portable Hard Drive
    60c4  M2 Portable Hard Drive USB 3.0
+	6124  D3 Station External Hard Drive
    61b6  M3 Portable Hard Drive 1TB
    6601  Mobile Phone
    6602  Galaxy
@@ -4705,12 +4832,15 @@
    6843  E2530 Phone (Samsung Kies mode)
    684e  Wave (GT-S8500)
    685b  GT-I9100 Phone [Galaxy S II] (mass storage mode)
-	685c  GT-I9250 Phone [Galaxy Nexus]
+	685c  GT-I9250 Phone [Galaxy Nexus] (Mass storage mode)
    685d  GT-I9100 Phone [Galaxy S II] (Download mode)
    685e  GT-I9100 / GT-C3350 Phones (USB Debugging mode)
-	6860  GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1]
+	6860  GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1] , GT-I9500 [Galaxy S 4]
+	6863  GT-I9500 [Galaxy S4] / GT-I9250 [Galaxy Nexus] (network tethering)
+	6864  GT-I9070 (network tethering, USB debugging enabled)
    6865  GT-I9300 Phone [Galaxy S III] (PTP mode)
    6866  GT-I9300 Phone [Galaxy S III] (debugging mode)
+	6868  Escape Composite driver for Android Phones: Modem+Diagnostic+ADB
    6875  GT-B3710 Standalone LTE device (Commercial)
    6876  GT-B3710 LTE Modem
    6877  Galaxy S
@@ -4761,6 +4891,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
@@ -4800,6 +4931,8 @@
    b044  Acer CrystalEye Webcam
    b057  integrated USB webcam
    b059  CKF7037 HP webcam
+	b064  CNA7137 Integrated Webcam
+	b070  Camera
    b071  2.0M UVC Webcam / CNF7129
    b083  CKF7063 Webcam (HP)
    b091  Webcam
@@ -4823,9 +4956,11 @@
    b272  Lenovo EasyCamera
    b2b0  Camera
    b2b9  Lenovo Integrated Camera UVC
+	b2da  thinkpad t430s camera
    b2ea  Integrated Camera [ThinkPad]
    b330  Asus 720p CMOS webcam
    b354  UVC 1.00 device HD UVC WebCam
+	b394  Integrated Camera
 04f3  Elan Microelectronics Corp.
    000a  Touchscreen
    0103  ActiveJet K-2024 Multimedia Keyboard
@@ -5032,8 +5167,11 @@
    01ea  DCP-7030
    01eb  MFC-7320
    01f4  MFC-5890CN
+	0217  MFC-8480DN
    0223  DCP-365CN
    0248  DCP-7055 scanner/printer
+	0273  DCP-7057 scanner/printer
+	02b3  MFC J4510DW
    1000  Printer
    1002  Printer
    2002  PTUSB Printing
@@ -5056,7 +5194,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
@@ -5072,7 +5210,9 @@
    5330  Digitrex 2110
    5331  Vivitar Vivicam 10
    5360  Sunplus Generic Digital Camera
+	5563  Digital Media Player MP3/WMA [The Sharper Image]
    5720  Card Reader Driver
+	6333  Siri A9 UVC chipset
    7333  Finet Technology Palmpix DC-85
    757a  Aiptek, MP315 MP3 Player
    ffff  PureDigital Ritz Disposable
@@ -5093,12 +5233,17 @@
    16e1  n10 Handheld Sync
    16e2  n20 Pocket PC Sync
    16e3  n30 Handheld Sync
+	2008  Liquid Gallant Duo E350 (preloader)
    3202  Liquid
    3203  Liquid (Debug mode)
    3230  BeTouch E120
    3317  Liquid
    3325  Iconia tablet A500
    3341  Iconia tablet A500
+	33c3  Liquid Gallant Duo E350
+	33c4  Liquid Gallant Duo E350 (debug mode)
+	33c7  Liquid Gallant Duo E350 (USB tethering)
+	33c8  Liquid Gallant Duo E350 (debug mode, USB tethering)
    d001  Divio NW801/DVC-V6+ Digital Camera
 0503  Hitachi America, Ltd
 0504  Hayes Microcomputer Products
@@ -5135,7 +5280,7 @@
    0004  Direct Connect
    0012  F8T012 Bluetooth Adapter
    0013  F8T013 Bluetooth Adapter
-	0017  B8T017 Bluetooth+EDR 2.1
+	0017  B8T017 Bluetooth+EDR 2.1 / F4U017 USB 2.0 7-port Hub
    003a  Universal Media Reader
    0050  F5D6050 802.11b Wireless Adapter v2000 [Atmel at76c503a]
    0081  F8T001v2 Bluetooth
@@ -5168,6 +5313,7 @@
    0409  F5U409 Serial
    0416  Staples 12416 7 port desktop hub
    0551  F6C550-AVR UPS
+	065a  F8T065BF Mini Bluetooth 4.0 Adapter
    0706  2-N-1 7-Port Hub (Lower half)
    0802  Nostromo n40 Gamepad
    0803  Nostromo 1745 GamePad
@@ -5180,11 +5326,13 @@
    1103  F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573]
    1106  F9L1106v1 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
    1109  F9L1109v1 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]
+	110a  F9L1101v2 802.11abgn Wireless Adapter [Realtek RTL8192DU]
    11f2  ISY Wireless Micro Adapter IWL 2000 [RTL8188CUS]
    1202  F5U120-PC Parallel Printer Port
    1203  F5U120-PC Serial Port
    2103  F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU]
    21f1  N300 WLAN N Adapter [ISY]
+	21f2  RTL8192CU 802.11n WLAN Adapter [ISY IWL 4000]
    258a  F5U258 Host to Host cable
    3101  F1DF102U/F1DG102U Flip Hub
    3201  F1DF102U/F1DG102U Flip KVM
@@ -5192,7 +5340,7 @@
    5055  F5D5055 Gigabit Network Adapter [AX88xxx]
    6050  F6D6050 802.11abgn Wireless Adapter [Broadcom BCM4323]
    6051  F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201]
-	615a  F7D4101 / F9L1101 802.11abgn Wireless Adapter [Broadcom BCM4323]
+	615a  F7D4101 / F9L1101v1 802.11abgn Wireless Adapter [Broadcom BCM4323]
    7050  F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887]
    7051  F5D7051 802.11g Adapter v1000 [Broadcom 4320 USB]
    705a  F5D7050 Wireless G Adapter v3000 [Ralink RT2571W]
@@ -5262,6 +5410,7 @@
    1080  NET1080 USB-USB Bridge
    1200  SSDC Adapter II
    1265  File-backed Storage Gadget
+	3424  Lumidigm Venus fingerprint sensor
    a0f0  Cambridge Electronic Devices Power1401 mk 2
    a140  USB Clik! 40
    a141  (OME) PocketZip 40 MP3 Player Driver
@@ -5403,6 +5552,7 @@
    2750  EZ-Link (EZLNKUSB.SYS)
    2810  Cypress ATAPI Bridge
    4d90  AmScope MD1900 camera
+	7000  PowerSpec MCE460 Front Panel LED Display
    7777  Bluetooth Device
    9999  AN2131 uninitialized (?)
 0548  Tyan Computer Corp.
@@ -5559,6 +5709,7 @@
    02c4  Device
    02d1  DVD RW
    02d2  PSP Slim
+	02d8  SBAC-US10 SxS PRO memory card reader/writer
    02e1  FeliCa S330 [PaSoRi]
    02ea  PlayStation 3 Memory Card Adaptor
    02f9  DSC-H9
@@ -5571,6 +5722,7 @@
    0348  HandyCam HDR-TG3E
    035b  Walkman NWZ-A828
    035c  NWZ-A726/A728/A729
+	035f  UP-DR200 Photo Printer
    0382  Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)
    0385  Walkman NWZ-E436F
    0387  IC Recorder (P)
@@ -5584,7 +5736,10 @@
    0440  DSC-H55
    0485  MHS-PM5 HD camcorder
    04cb  WALKMAN NWZ-E354
+	0541  DSC-HX100V [Cybershot Digital Still Camera]
+	0689  Walkman NWZ-B173F
    06bb  WALKMAN NWZ-F805
+	088c  Portable Headphone Amplifier
    1000  Wireless Buzz! Receiver
 054d  Try Corp.
 054e  Proside Corp.
@@ -5593,6 +5748,8 @@
    0002  InkJet Color Printer
    0004  InkJet Color Printer
    0005  InkJet Color Printer
+	000b  Workcentre 24
+	014e  CM215b Printer
 0551  CompuTrend Systems, Inc.
 0552  Philips Monitors
 0553  STMicroelectronics Imaging Division (VLSI Vision)
@@ -5734,6 +5891,7 @@
    2800  MIC K/B
    2801  MIC K/B Mouse
    2802  Kbd Hub
+	3002  Keyboard
    3004  Genius KB-29E
    3107  Keyboard
 0567  Xyratex International, Ltd
@@ -5788,6 +5946,7 @@
    0065  Bamboo
    0069  Bamboo One
    0081  Graphire Wireless 6x8
+	0084  Wireless adapter for Bamboo tablets
    0090  TPC90
    0093  TPC93
    009a  TPC9A
@@ -5810,12 +5969,16 @@
    00cc  Cintiq 21UX (DTK-2100)
    00d1  Bamboo Pen & Touch (CTH-460-DE)
    00d3  Bamboo Fun (CTH-661)
+	00d4  Bamboo Pen (CTL-460)
    00d6  Bamboo Pen & Touch (CTH-460)
    00db  Bamboo Fun (CTH-661SE-NL)
    00dd  Bamboo Pen (CTL-470)
    00de  CTH-470 [Bamboo Fun Pen & Touch]
    00f6  Cintiq 24HD touch (DTH-2400) touchscreen
    00f8  Cintiq 24HD touch (DTH-2400) tablet
+	0307  Cintiq Companion Hybrid 13HD (DTH-A1300) tablet
+	0309  Cintiq Companion Hybrid 13HD (DTH-A1300) touchscreen
+	030e  Intuos Pen Small (CTL480)
    0400  PenPartner 4x5
    4850  PenPartner 6x8
 056b  Decicon, Inc.
@@ -5852,6 +6015,7 @@
    0040  Wondereye CP-115 Webcam
    0041  Webcam Notebook
    0042  Webcam Notebook
+	0320  DVBSky T330 DVB-T2/C tuner
    1232  V.90 modem
    1234  Typhoon Redfun Modem V90 56k
    1252  HCF V90 Data Fax Voice Modem
@@ -5862,8 +6026,13 @@
    2000  SoftGate 802.11 Adapter
    2002  SoftGate 802.11 Adapter
    262a  tm5600 Video & Audio Grabber Capture
+	680c  DVBSky T680C DVB-T2/C tuner
+	6831  DVBSky S960 DVB-S2 tuner
    8390  WinFast PalmTop/Novo TV Video
    8392  WinFast PalmTop/Novo TV Video
+	960c  DVBSky S960C DVB-S2 tuner
+	c686  Geniatech T220A DVB-T2 TV Stick
+	c688  Geniatech T230 DVB-T2 TV Stick
    cafc  CX861xx ROM Boot Loader
    cafe  AccessRunner ADSL Modem
    cb00  ADSL Modem
@@ -6210,6 +6379,7 @@
 0584  RATOC System, Inc.
    0008  Fujifilm MemoryCard ReaderWriter
    0220  U2SCX SCSI Converter
+	0304  U2SCX-LVD (SCSI Converter)
    b000  REX-USB60
    b020  REX-USB60F
 0585  FlashPoint Technology, Inc.
@@ -6259,13 +6429,16 @@
    341a  NWD-270N Wireless N-lite USB Adapter
    341e  NWD2105 802.11bgn Wireless Adapter [Ralink RT3070]
    341f  NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU]
+	3425  NWD6505 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7610U]
    343e  N220 802.11bgn Wireless Adapter
 0587  America Kotobuki Electronics Industries, Inc.
 0588  Sapien Design
 0589  Victron
 058a  Nohau Corp.
 058b  Infineon Technologies
+	0015  Flash Loader utility
    001c  Flash Drive
+	0041  Flash Loader utility
 058c  In Focus Systems
    0007  Flash
    0008  LP130
@@ -6304,7 +6477,7 @@
    6362  Flash Card Reader/Writer
    6364  AU6477 Card Reader Controller
    6366  Multi Flash Reader
-	6377  Multimedia Card Reader
+	6377  AU6375 4-LUN card reader
    6386  Memory Card
    6387  Flash Drive
    6390  USB 2.0-IDE bridge
@@ -6328,8 +6501,10 @@
    9472  Keyboard Hub
    9510  ChunghwaTL USB02 Smartcard Reader
    9520  EMV Certified Smart Card Reader
+	9540  AU9540 Smartcard Reader
    9720  USB-Serial Adapter
    a014  Asus Integrated Webcam
+	b002  Acer Integrated Webcam
 0590  Omron Corp.
    0004  Cable Modem
    000b  MR56SVS
@@ -6347,6 +6522,7 @@
    0001  Touchscreen
    0002  Touch Screen Controller
    0500  PCT Multitouch HID Controller
+	0543  DELL XPS touchscreen
 0597  Trisignal Communications
 0598  Niigata Canotec Co., Inc.
 0599  Brilliance Semiconductor, Inc.
@@ -6371,6 +6547,7 @@
    0060  PCMCIA PocketZip Dock
    0061  Varo PocketZip 40 MP3 Player
    006d  HipZip MP3 Player
+	0070  eGo Portable Hard Drive
    007c  Ultra Max USB/1394
    007d  HTC42606 0G9AT00 [Iomega HDD]
    007e  Mini 256MB/512MB Flash Drive [IOM2D5]
@@ -6407,7 +6584,9 @@
    0213  PocketDrive USB2
    0323  LaCie d2 Drive USB2
    0421  Big Disk G465
+	0525  BigDisk Extreme 500
    0641  Mobile Hard Drive
+	0829  BigDisk Extreme+
    100c  Rugged Triple Interface Mobile Hard Drive
    1010  Desktop Hard Drive
    1019  Desktop Hard Drive
@@ -6416,6 +6595,7 @@
    102a  Rikiki Hard Drive
    1049  rikiki Harddrive
    1052  P'9220 Mobile Drive
+	1064  Rugged 16 and 32 GB
    a601  HardDrive
    a602  CD R/W
 05a0  Vetronix Corp.
@@ -6440,6 +6620,12 @@
    0003  CVA124E Cable Voice Adapter (WDM)
    0004  CVA122E Cable Voice Adapter (WDM)
 05a7  Bose Corp.
+	4000  Bluetooth Headset
+	4001  Bluetooth Headset in DFU mode
+	4002  Bluetooth Headset Series 2
+	4003  Bluetooth Headset Series 2 in DFU mode
+	bc50  SoundLink Wireless Mobile speaker
+	bc51  SoundLink Wireless Mobile speaker in DFU mode
 05a8  Spacetec IMC Corp.
 05a9  OmniVision Technologies, Inc.
    0511  OV511 Webcam
@@ -6507,7 +6693,7 @@
    0223  Internal Keyboard/Trackpad (ANSI)
    0224  Internal Keyboard/Trackpad (ISO)
    0225  Internal Keyboard/Trackpad (JIS)
-	0229  Internal Keyboard/Trackpad (MacBook Pro) (ANSI)
+	0229  Internal Keyboard/Trackpad (ANSI)
    022a  Internal Keyboard/Trackpad (MacBook Pro) (ISO)
    022b  Internal Keyboard/Trackpad (MacBook Pro) (JIS)
    0230  Internal Keyboard/Trackpad (MacBook Pro 4,1) (ANSI)
@@ -6534,7 +6720,7 @@
    0263  Apple Internal Keyboard / Trackpad (MacBook Retina)
    0301  USB Mouse [Mitsumi, M4848]
    0302  Optical Mouse [Fujitsu]
-	0304  Optical USB Mouse [Mitsumi]
+	0304  Mighty Mouse [Mitsumi, M1152]
    0306  Optical USB Mouse [Fujitsu]
    030a  Internal Trackpad
    030b  Internal Trackpad
@@ -6545,6 +6731,7 @@
    1002  Extended Keyboard Hub [Mitsumi]
    1003  Hub in Pro Keyboard [Mitsumi, A1048]
    1006  Hub in Aluminum Keyboard
+	1008  Mini DisplayPort to Dual-Link DVI Adapter
    1101  Speakers
    1105  Audio in LED Cinema Display
    1107  Thunderbolt Display Audio
@@ -6576,6 +6763,7 @@
    1263  iPod Nano 4.Gen
    1265  iPod Nano 5.Gen
    1266  iPod Nano 6.Gen
+	1267  iPod Nano 7.Gen
    1281  Apple Mobile Device [Recovery Mode]
    1290  iPhone
    1291  iPod Touch 1.Gen
@@ -6586,13 +6774,19 @@
    1297  iPhone 4
    1299  iPod Touch 3.Gen
    129a  iPad
+	129c  iPhone 4(CDMA)
    129e  iPod Touch 4.Gen
    129f  iPad 2
    12a0  iPhone 4S
    12a2  iPad 2 (3G; 64GB)
+	12a3  iPad 2 (CDMA)
+	12a4  iPad 3 (wifi)
+	12a5  iPad 3 (CDMA)
    12a6  iPad 3 (3G, 16 GB)
+	12a8  iPhone5/5C/5S
    12a9  iPad 2
    12aa  iPod Touch 5.Gen [A1421]
+	12ab  iPad 4 (WiFi, 32GB)
    1300  iPod Shuffle
    1301  iPod Shuffle 2.Gen
    1302  iPod Shuffle 3.Gen
@@ -6600,6 +6794,9 @@
    1401  Modem
    1402  Ethernet Adapter [A1277]
    1500  SuperDrive [A1379]
+	8005  OHCI Root Hub Simulation
+	8006  EHCI Root Hub Simulation
+	8007  XHCI Root Hub USB 2.0 Simulation
    8202  HCF V.90 Data/Fax Modem
    8203  Bluetooth HCI
    8204  Built-in Bluetooth 2.0+EDR HCI
@@ -6632,6 +6829,7 @@
    850a  FaceTime Camera
    8510  FaceTime HD Camera (Built-in)
    911c  Hub in A1082 [Cinema HD Display 23"]
+	9127  Hub in Thunderbolt Display
    912f  Hub in 30" Cinema Display
    9215  Studio Display 15"
    9217  Studio Display 17"
@@ -6700,6 +6898,7 @@
    9201  Gobi Wireless Modem (QDL mode)
    9202  Gobi Wireless Modem
    9203  Gobi Wireless Modem
+	9205  Gobi 2000
    9211  Acer Gobi Wireless Modem (QDL mode)
    9212  Acer Gobi Wireless Modem
    9214  Acer Gobi 2000 Wireless Modem (QDL mode)
@@ -6727,7 +6926,10 @@
    0103  FO13FF-65 PC-CAM
    021a  HP Webcam
    0318  Webcam
+	0361  SunplusIT INC. HP Truevision HD Webcam
+	036e  Webcam
    0403  Webcam
+	041b  HP 2.0MP High Definition Webcam
 05c9  Semtech Corp.
 05ca  Ricoh Co., Ltd
    0101  RDC-5300 Camera
@@ -6907,6 +7109,7 @@
    40ff  ScanMaker 3600
    5003  Goya
    5013  3200 Scanner
+	6072  XT-3500 A4 HD Scanner
    80a3  ScanMaker V6USL (#2)
    80ac  ScanMaker V6UL/SpicyU
 05db  Sun Corp. (Suntac?)
@@ -6973,6 +7176,7 @@
    4d02  MP3 Player
    4d12  MP3 Player
    4d30  MP3 Player
+	a209  JumpDrive S70
    a300  JumpDrive2
    a400  JumpDrive trade; Pro 40-501
    a410  JumpDrive 128MB/256MB
@@ -6993,12 +7197,15 @@
    a560  JumpDrive FireFly
    a701  JumpDrive FireFly
    a731  JumpDrive FireFly
+	a768  JumpDrive Retrax
    a790  JumpDrive 2GB
    a811  16GB Gizmo!
    a813  16gB flash thumb drive
+	a815  JumpDrive V10
    b002  USB CF Reader
    b018  Multi-Card Reader
    b047  SDHC Reader [RW047-7000]
+	ba02  Workflow CFR1
    c753  JumpDrive TwistTurn
 05dd  Delta Electronics, Inc.
    ff31  AWU-120
@@ -7010,6 +7217,7 @@
    0700  Bar Code Scanner (CS1504)
    0800  Spectrum24 Wireless LAN Adapter
    1200  Bar Code Scanner
+	1701  Bar Code Scanner (CDC)
    1900  SNAPI Imaging Device
    2000  MC3090 Rugged Mobile Computer
    200d  MC70 Rugged Mobile Computer
@@ -7047,8 +7255,9 @@
    0605  USB 2.0 Hub
    0606  USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub
    0607  Logitech G110 Hub
-	0608  USB-2.0 4-Port HUB
+	0608  Hub
    0610  4-port hub
+	0616  hub
    0660  USB 2.0 Hub
    0700  SIIG US2256 CompactFlash Card Reader
    0701  USB 2.0 IDE Adapter
@@ -7072,11 +7281,15 @@
    0717  All-in-1 Card Reader
    0718  IDE/SATA Adapter
    0719  SATA adapter
+	0722  SD/MMC card reader
    0723  GL827L SD/MMC/MS Flash Card Reader
    0726  SD Card Reader
    0727  microSD Reader/Writer
    0731  GL3310 SATA 3Gb/s Bridge Controller
+	0732  All-in-One Cardreader
    0736  microSD Reader/Writer
+	0741  microSD Card Reader
+	0743  SDXC and microSDXC CardReader
    0760  USB 2.0 Card Reader/Writer
    0761  Genesys Mass Storage Device
    0780  USBFS DFU Adapter
@@ -7118,6 +7331,7 @@
    0007  Kinesis Advantage PRO MPC/USB Keyboard
    0081  Kinesis Integrated Hub
    00ff  VEC Footpedal
+	0203  Y-mouse Keyboard & Mouse Adapter
    020b  PS2 Adapter
    0232  X-Keys Switch Interface, Programming Mode
    0261  X-Keys Switch Interface, SPLAT Mode
@@ -7127,16 +7341,20 @@
 05f7  RFC Distribution(s) PTE, Ltd
 05f9  PSC Scanning, Inc.
    1104  Magellan 2200VS
+	1206  Gryphon series (OEM mode)
    2202  Point of Sale Handheld Scanner
-	2206  Datalogic Gryphon GFS4170
-	2601  Datalogin Magellan 1000i Barcode Scanner
+	2206  Gryphon series (keyboard emulation mode)
+	220c  Datalogic Gryphon GD4430
+	2601  Datalogic Magellan 1000i Barcode Scanner
    2602  Datalogic Magellan 1100i Barcode Scanner
+	4204  Gryphon series (RS-232 emulation mode)
    5204  Datalogic Gryphon GFS4170 (config mode)
 05fa  Siemens Telecommunications Systems, Ltd
    3301  Keyboard with PS/2 Mouse Port
    3302  Keyboard
    3303  Keyboard with PS/2 Mouse Port
-05fc  Harman Multimedia
+05fc  Harman
+	0001  Soundcraft Si Multi Digital Card
    7849  Harman/Kardon SoundSticks
 05fd  InterAct, Inc.
    0239  SV-239 HammerHead Digital
@@ -7156,6 +7374,7 @@
    0011  Browser Mouse
    0014  Gamepad
    1010  Optical Wireless
+	2001  Microsoft Wireless Receiver 700
 05ff  LeCroy Corp.
 0600  Barco Display Systems
 0601  Jazz Hipster Corp.
@@ -7163,7 +7382,8 @@
 0602  Vista Imaging, Inc.
    1001  ViCam Webcam
 0603  Novatek Microelectronics Corp.
-	00f1  Keyboard
+	00f1  Keyboard (Labtec Ultra Flat Keyboard)
+	00f2  Keyboard (Labtec Ultra Flat Keyboard)
    6871  Mouse
 0604  Jean Co., Ltd
 0605  Anchor C&C Co., Ltd
@@ -7183,6 +7403,7 @@
    2101  Keyboard
    2231  KSK-6001 UELX Keyboard
    2270  Gigabyte K8100 Aivia Gaming Keyboard
+	5253  Thermaltake MEKA G-Unit Gaming Keyboard
    5811  ACK-571U Wireless Keyboard
    5903  Japanese Keyboard - 595U
    6001  SolidTek USB 2p HUB
@@ -7251,6 +7472,7 @@
    0201  Defender Office Keyboard (K7310) S Zodiak KM-9010
    0252  Emerge Uni-retractable Laser Mouse
    3286  Nano Receiver [Sandstrom Laser Mouse SMWLL11]
+	4101  Wireless Keyboard/Mouse
    6301  Trust Wireless Optical Mouse MI-4150K
    9003  VoIP Conference Hub (A16GH)
    9004  USR9602 USB Internet Mini Phone
@@ -7295,7 +7517,7 @@
    1000  CD-ROM Drive
    800d  TASCAM Portastudio DP-01FX
    800e  TASCAM US-122L
-	801d  DR-100
+	801d  TASCAM DR-100
    8021  TASCAM US-122mkII
    d001  CD-R/RW Unit
    d002  CD-R/RW Unit
@@ -7324,6 +7546,7 @@
    a103  Acer/HP Integrated Webcam [CN0314]
    a110  HP Webcam
    a114  Lemote Webcam
+	a116  UVC 1.3MPixel WebCam
    a136  Asus Integrated Webcam [CN031B]
    a219  1.3M WebCam (notebook emachines E730, Acer sub-brand)
    c107  HP webcam [dv6-1190en]
@@ -7647,11 +7870,12 @@
 068e  CH Products, Inc.
    00d3  OEM 3 axis 5 button joystick
    00e2  HFX OEM Joystick
+	00f0  Multi-Function Panel
    00f1  Pro Throttle
    00f2  Flight Sim Pedals
    00f3  Fighterstick
    00f4  Combatstick
-	00fa  Flight Sim Pedals
+	00fa  Ch Throttle Quadrant
    00ff  Flight Sim Yoke
    0500  GameStick 3D
    0501  CH Pro Pedals
@@ -7672,6 +7896,7 @@
    2003  CTX M730V built in Camera
    9999  VLxxxx Monitor+Hub
 0699  Tektronix, Inc.
+	0347  AFG 3022B
 069a  Askey Computer Corp.
    0001  VC010 Webcam [pwc]
    0303  Cable Modem
@@ -7849,6 +8074,7 @@
 06bf  Leoco Corp.
 06c2  Phidgets Inc. (formerly GLAB)
    0030  PhidgetRFID
+	0031  RFID reader
    0038  4-Motor PhidgetServo v3.0
    0039  1-Motor PhidgetServo v3.0
    003a  8-Motor PhidgetAvancedServo
@@ -7878,6 +8104,7 @@
    0007  Monitor Control
    0009  Monitor Control
 06ca  Newer Technology, Inc.
+	2003  uSCSI
 06cb  Synaptics, Inc.
    0001  TouchPad
    0002  Integrated TouchPad
@@ -7890,6 +8117,7 @@
    000e  HID Device
    0010  Wireless TouchPad
    0013  DisplayPad
+	2970  touchpad
 06cc  Terayon Communication Systems
    0101  Cable Modem
    0102  Cable Modem
@@ -7950,6 +8178,8 @@
    0393  CP9500D/DW Port
    0394  CP9000D/DW Port
    03a1  CP9550D/DW Port
+	3b30  CP-D70DW / CP-D707DW
+	3b31  CP-K60DW-S
 06d4  Cisco Systems
 06d5  Toshiba
    4000  Japanese Keyboard
@@ -8210,15 +8440,55 @@
 072f  Advanced Card Systems, Ltd
    0001  AC1030-based SmartCard Reader
    0008  ACR 80 Smart Card Reader
+	0100  AET65
+	0101  AET65
+	0102  AET62
+	0103  AET62
+	0901  ACR1281U-C4 (BSI)
    1000  PLDT Drive
    1001  PLDT Drive
+	2011  ACR88U
+	2100  ACR128U
+	2200  ACR122U
+	220a  ACR1281U-C5 (BSI)
+	220c  ACR1283 Bootloader
+	220f  ACR1281U-C2 (qPBOC)
+	2211  ACR1261 1S Dual Reader
+	2214  ACR1222 1SAM PICC Reader
+	2215  ACR1281 2S CL Reader
+	221a  ACR1251U-A1
+	221b  ACR1251U-C
+	2224  ACR1281 1S Dual Reader
+	222b  ACR1222U-C8
+	222c  ACR1283L-D2
+	222d  [OEM Reader]
+	222e  ACR123U
+	2242  ACR1251 1S Dual Reader
    8002  AET63 BioTRUSTKey
    8003  ACR120
    8103  ACR120
+	8201  APG8201
+	8900  ACR89U-A1
+	8901  ACR89U-A2
+	8902  ACR89U-A3
    9000  ACR38 AC1038-based Smart Card Reader
+	9006  CryptoMate
    90cc  ACR38 SmartCard Reader
+	90ce  [OEM Reader]
    90cf  ACR38 SAM Smart Card Reader
    90d0  PertoSmart EMV - Card Reader
+	90d2  ACR83U
+	90d8  ACR3801
+	90db  CryptoMate64
+	b000  ACR3901U
+	b100  ACR39U
+	b101  ACR39K
+	b102  ACR39T
+	b103  ACR39F
+	b104  ACR39U-SAM
+	b106  ACOS5T2
+	b200  ACOS5T1
+	b301  ACR32-A1
 0731  Susteen, Inc.
    0528  SonyEricsson DCU-11 Cable
 0732  Goldfull Electronics & Telecommunications Corp.
@@ -8369,6 +8639,8 @@
    0501  CP1500 AVR UPS
 0765  X-Rite, Inc.
    5001  Huey PRO Colorimeter
+	5020  i1 Display Pro
+	6003  ColorMunki Smile
    d094  X-Rite DTP94 [Quato Silver Haze Pro]
 0766  Jess-Link Products Co., Ltd
    001b  Packard Bell Go
@@ -8395,6 +8667,8 @@
    4321  CardMan 4321
    5121  CardMan 5121
    5125  CardMan 5125
+	5321  CardMan 5321
+	5340  CardMan 5021 CL
    6622  CardMan 6121
    a011  CCID Smart Card Reader Keyboard
    a021  CCID Smart Card Reader
@@ -8462,8 +8736,12 @@
    540e  Cruzer Contour Flash Drive
    5530  Cruzer
    5567  Cruzer Blade
+	556c  Ultra
+	556d  Memory Vault
    5571  Cruzer Fit
+	5576  Cruzer Facet
    5580  SDCZ80 Flash Drive
+	5581  Ultra
    5e10  Encrypted
    6100  Ultra II SD Plus 2GB
    7100  Cruzer Mini
@@ -8504,6 +8782,7 @@
    74c3  Sansa Fuze V2 (msc)
    74d0  Sansa Clip+ (mtp)
    74d1  Sansa Clip+ (msc)
+	74e5  Sansa Clip Zip
    8181  Pen Flash
    8183  Hi-Speed Mass Storage Device
    8185  SDCZ2 Cruzer Mini Flash Drive (older, thick)
@@ -8630,7 +8909,8 @@
    0017  FEther USB2-TX
    0018  Wireless LAN USB-11 mini 2
    001a  ULUSB-11 Key
-	001c  CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887]
+	001c  CG-WLUSB2GT 802.11g Wireless Adapter [Intersil ISL3880]
+	0020  CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887]
    002e  CG-WLUSB2GPX [Ralink RT2571W]
    002f  CG-WLUSB2GNL
    0031  CG-WLUSB2GS 802.11bg [Atheros AR5523]
@@ -8648,7 +8928,7 @@
    fc02  Cable II USB-2
    fc03  USB2-IDE IDE bridge
    fcd6  Freecom HD Classic
-	fcf6  DataBar 512 MB
+	fcf6  DataBar
    fcf8  Freecom Classic SL Network Drive
    fcfe  Hard Drive 80GB
 07af  Microtech
@@ -8725,6 +9005,7 @@
    0113  Mju 500
    0114  C-350Z Camera
    0118  Mju Mini Digital/Mju Digital 500 Camera / Stylus 850 SW
+	0125  Tough TG-1 Camera
    0184  P-S100 port
    0202  Foot Switch RS-26
    0203  Digital Voice Recorder DW-90
@@ -8834,6 +9115,7 @@
    a200  DF-UT-06 Hama MMC/SD Reader
    a400  CompactFlash & Microdrive Reader
    a600  Card Reader
+	a604  12-in-1 Card Reader
    ad01  Mass Storage Device
    ae01  Mass Storage Device
    af01  Mass Storage Device
@@ -8845,6 +9127,7 @@
    b00b  USB to Memory Stick(LC1)
    c010  Kingston FCR-HS2/ATA Card Reader
 07c5  APG Cash Drawer
+	0500  Cash Drawer
 07c6  ShareWave, Inc.
    0002  Bodega Wireless Access Point
    0003  Bodega Wireless Network Adapter
@@ -8868,6 +9151,7 @@
    a815  AVerTV DVB-T Volar X (A815)
    a827  AVerTV Hybrid Volar HX (A827)
    a867  AVerTV DVB-T (A867)
+	b300  A300 DVB-T TV receiver
    b800  MR800 FM Radio
    e880  MPEG-2 Capture Device (E880)
    e882  MPEG-2 Capture Device (E882)
@@ -8950,6 +9234,7 @@
    4104  Cw75 Device
    4107  CW-L300 Device
    4500  LV-20 Digital Camera
+	6101  fx-9750gII
    6801  PL-40R
    6802  MIDI Keyboard
 07d0  Dazzle
@@ -9067,6 +9352,7 @@
 0802  Mako Technologies, LLC
 0803  Zoom Telephonics, Inc.
    1300  V92 Faxmodem
+	3095  V.92 56K Mini External Modem Model 3095
    4310  4410a Wireless-G Adapter [Intersil ISL3887]
    4410  4410b Wireless-G Adapter [ZyDAS ZD1211B]
    5241  Cable Modem
@@ -9201,6 +9487,7 @@
    4505  SMCWUSB-G 802.11bg
    4507  SMCWUSBT-G2 802.11g Wireless Adapter [Atheros AR5523]
    4521  Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887]
+	4531  T-Com Sinus 154 data II [Intersil ISL3887]
    5046  SpeedStream 10/100 Ethernet [pegasus]
    5501  Wireless Adapter 11g
    6500  Cable Modem
@@ -9258,10 +9545,15 @@
    9012  WNDA4100 802.11abgn 3x3:3 [Ralink RT3573]
    9018  WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
    9020  WNA3100(v1) Wireless-N 300 [Broadcom BCM43231]
+	9021  WNA3100M(v1) Wireless-N 300 [Realtek RTL8192CU]
    9030  WNA1100 Wireless-N 150 [Atheros AR9271]
    9040  WNA1000 Wireless-N 150 [Atheros AR9170+AR9101]
    9041  WNA1000M 802.11bgn [Realtek RTL8188CUS]
+	9042  On Networks N150MA 802.11bgn [Realtek RTL8188CUS]
+	9050  A6200 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
+	9052  A6100 AC600 DB Wireless Adapter [Realtek RTL8811AU]
    a001  PA101 10 Mbps HPNA Home Phoneline RJ-1
+	f001  On Networks N300MA 802.11bgn [Realtek RTL8192CU]
 084d  Minton Optic Industry Co., Inc.
    0001  Jenoptik JD800i
    0003  S-Cam F5/D-Link DSC-350 Digital Camera
@@ -9303,6 +9595,7 @@
    0022  Parallel Port
    0023  2 port to Serial Converter
    0024  Parallel Port
+	0026  PortGear SCSI
    0027  1 port to Serial Converter
    0028  PortGear to SCSI Converter
    0032  PortStation SCSI Module
@@ -9312,7 +9605,10 @@
    8023  2 port to Serial
    8027  PGSDB9 Serial Port
 085c  ColorVision, Inc.
-	0200  Monitor Spyder
+	0100  Spyder 1
+	0200  Spyder 2
+	0300  Spyder 3
+	0400  Spyder 4
 0862  Teletrol Systems, Inc.
 0863  Filanet Corp.
 0864  NetGear, Inc.
@@ -9396,6 +9692,8 @@
    5036  Portable secure storage for software licenses
 0892  DioGraphy, Inc.
    0101  Smartdio Reader/Writer
+0894  TSI Incorporated
+	0010  Remote NDIS Network Device
 0897  Lauterbach
    0002  Power Debug/Power Debug II
 089c  United Technologies Research Cntr.
@@ -9414,6 +9712,10 @@
    0014  USBee AX-Pro
    0015  USBee DX
 08ae  Macally (Mace Group, Inc.)
+08b0  Metrohm
+	0006  814 Sample Processor
+	0015  857 Titrando
+	001a  852 Titrando
 08b4  Sorenson Vision, Inc.
 08b7  NATSU
    0001  Playstation adapter
@@ -9529,6 +9831,7 @@
    0102  ADSL
    0301  RNIS
 08e4  Pioneer Corp.
+	0185  DDJ-WeGO2
 08e5  Litronic
 08e6  Gemalto (was Gemplus)
    0001  GemPC-Touch 430
@@ -9699,6 +10002,8 @@
    0002  SigmaDrive Adapter (TPP)
 0906  Faraday Technology Corp.
 0908  Siemens AG
+	01f4  SIMATIC NET CP 5711
+	01fe  SIMATIC NET PC Adapter A2
    2701  ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA
 0909  Audio-Technica Corp.
 090a  Trumpion Microelectronics, Inc.
@@ -9782,8 +10087,10 @@
    2380  Oregon series
    23cc  nüvi 1350
    2459  GPSmap 62/78 series
+	2491  Edge 800
    2519  eTrex 30
    2535  Edge 800
+	253c  GPSmap 62sc
    255b  Nuvi 2505LM
 0920  Echelon Co.
    7500  Network Interface
@@ -9792,14 +10099,18 @@
 0922  Dymo-CoStar Corp.
    0007  LabelWriter 330
    0009  LabelWriter 310
+	0019  LabelWriter 400
    001a  LabelWriter 400 Turbo
    0020  LabelWriter 450
+	1001  LabelManager PnP
+	8004  M25 Digital Postal Scale
 0923  IC Media Corp.
    010f  SIIG MobileCam
 0924  Xerox
    23dd  DocuPrint M760 (X760_USB)
    3ce8  Phaser 3428 Printer
    3d5b  Phaser 6115MFP TWAIN Scanner
+	3d6d  WorkCentre 6015N/NI
    420f  WorkCentre PE220 Series
    421f  M20 Scanner
    423b  Printing Support
@@ -9808,6 +10119,7 @@
    fffb  DocuPrint M750 (X750_USB)
 0925  Lakeview Research
    0005  Gamtec.,Ltd SmartJoy PLUS Adapter
+	03e8  Wii Classic Controller Adapter
    3881  Saleae Logic
    8101  Phidgets, Inc., 1-Motor PhidgetServo v2.0
    8104  Phidgets, Inc., 4-Motor PhidgetServo v2.0
@@ -9826,6 +10138,7 @@
    0009  Gigabeat F/X (HDD audio player)
    000c  Gigabeat F (mtp)
    0010  Gigabeat S (mtp)
+	0200  Integrated Bluetooth (Taiyo Yuden)
    0301  PCX1100U Cable Modem (WDM)
    0302  PCX2000 Cable Modem (WDM)
    0305  Cable Modem PCX3000
@@ -9848,6 +10161,7 @@
    070a  Pocket PC e400 Series
    070b  Pocket PC e800 Series
    0a07  WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572]
+	0a13  AX88179 Gigabit Ethernet [Toshiba]
    0b05  PX1220E-1G25 External hard drive
    0b09  PX1396E-3T01 External hard drive
    0b1a  STOR.E ALU 2S
@@ -9899,8 +10213,8 @@
    653d  Kingston DataTraveler 2.0 Stick (1GB)
    653e  Flash Memory
    6540  TransMemory Flash Memory
-	6544  Kingston DataTraveler 2.0 Stick (2GB)
-	6545  Kingston DataTraveler 102 Flash Drive / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick
+	6544  TransMemory-Mini / Kingston DataTraveler 2.0 Stick (2GB)
+	6545  Kingston DataTraveler 102/2.0 / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick
 0931  Harmonic Data Systems, Ltd
 0932  Crescentec Corp.
    0300  VideoAdvantage
@@ -9917,7 +10231,7 @@
    0030  Composite Device, Mass Storage Device (Flash Drive) amd HID
    003c  Rhythmedics HID Bootloader
 0939  Lumberg, Inc.
-	0b15  Toshiba Stor.E Alu 2 1TB (PX1710E-1HJ0)
+	0b15  Toshiba Stor.E Alu 2
 093a  Pixart Imaging, Inc.
    0007  CMOS 100K-R Rev. 1.90
    010e  Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A
@@ -9938,6 +10252,7 @@
    260e  PAC7311 Gigaware VGA PC Camera:Trust WB-3350p:SIGMA cam 2350
    260f  PAC7311 SnakeCam
    2621  PAC731x Trust Webcam
+	2622  Webcam Genius
    2624  Webcam
 093b  Plextor Corp.
    0010  Storage Adapter
@@ -9994,6 +10309,7 @@
    160d  DataTraveler Vault Privacy
    1613  DataTraveler DT101C Flash Drive
    1616  DataTraveler Locker 4GB
+	161a  Dell HyperVisor internal flash drive
    1621  DataTraveler 150 (32GB)
    1624  DataTraveler G2
    1625  DataTraveler 101 II
@@ -10004,24 +10320,34 @@
    1643  DataTraveler G3
    1653  Data Traveler 100 G2 8 GiB
    1656  DataTraveler Ultimate G2
+	1665  Digital DataTraveler SE9 64GB
+	1666  DataTraveler G4
    1689  DataTraveler SE9
    168a  DataTraveler Micro
    168c  DT Elite 3.0
 0954  RPM Systems Corp.
 0955  NVidia Corp.
    7030  Tegra 3 (recovery mode)
-	7100  Notion Ink Adam
+	7100  Tegra Device
    7820  Tegra 2 AC100 developer mode
    b400  SHIELD (debug)
    b401  SHIELD
+	cf05  SHIELD Tablet (debug)
+	cf06  SHIELD Tablet
+	cf07  SHIELD Tablet
+	cf08  SHIELD Tablet
+	cf09  SHIELD Tablet
 0956  BSquare Corp.
 0957  Agilent Technologies, Inc.
    0200  E-Video DC-350 Camera
    0202  E-Video DC-350 Camera
+	0407  33220A Waveform Generator
    0518  82357B GPIB Interface
    0a07  34411A Multimeter
+	1507  33210A Waveform Generator
    1745  Test and Measurement Device (IVI)
    2918  U2702A oscilloscope
+	fb18  LC Device
 0958  CompuLink Research, Inc.
 0959  Cologne Chip AG
    2bd0  Intelligent ISDN (Ver. 3.60.04)
@@ -10031,7 +10357,7 @@
 095c  K-Tec Electronics
 095d  Polycom, Inc.
    0001  Polycom ViaVideo
-0967  Acer (??)
+0967  Acer NeWeb Corp.
    0204  WarpLink 802.11b Adapter
 0968  Catalyst Enterprises, Inc.
 096e  Feitian Technologies, Inc.
@@ -10039,9 +10365,11 @@
    0802  ePass2000 (G&D STARCOS SPK 2.4)
    0807  ePass2003
 0971  Gretag-Macbeth AG
+	2000  i1 Pro
+	2001  i1 Monitor
    2003  Eye-One display
    2005  Huey
-	2007  ColorMunki
+	2007  ColorMunki Photo
 0973  Schlumberger
    0001  e-gate Smart Card
 0974  Datagraphix, a business unit of Anacomp
@@ -10081,6 +10409,7 @@
 099a  Zippy Technology Corp.
    0638  Sanwa Supply Inc. Small Keyboard
    610c  EL-610 Super Mini Electron luminescent Keyboard
+	713a  WK-713 Multimedia Keyboard
    7160  Hyper Slim Keyboard
 09a3  PairGain Technologies
 09a4  Contech Research, Inc.
@@ -10136,6 +10465,8 @@
 09c4  ACTiSYS Corp.
    0011  ACT-IR2000U IrDA Dongle
 09c5  Memory Corp.
+09ca  BMC Messsysteme GmbH
+	5544  PIO
 09cc  Workbit Corp.
    0404  BAFO USB-ATA/ATAPI Bridge Controller
 09cd  Psion Dacom Home Networks, Ltd
@@ -10145,13 +10476,14 @@
 09d1  NeoMagic, Inc.
 09d2  Vreelin Engineering, Inc.
 09d3  Com One
-	0001  ISDN TA
+	0001  ISDN TA / Light Rider 128K
+	000b  Bluetooth Adapter class 1 [BlueLight]
 09d7  Novatel Wireless
    0100  NovAtel FlexPack GPS receiver
 09d9  KRF Tech, Ltd
-09da  A4 Tech Co., Ltd
+09da  A4Tech Co., Ltd.
    0006  Optical Mouse WOP-35 / Trust 450L Optical Mouse
-	000a  Optical Mouse Opto 510D
+	000a  Optical Mouse Opto 510D / OP-620D
    000e  X-F710F Optical Mouse 3xFire Gaming Mouse
    0018  Trust Human Interface Device
    001a  Wireless Mouse & RXM-15 Receiver
@@ -10219,6 +10551,8 @@
    00d0  ADU208 Relay I/O Interface
    00da  ADU218 Solid-State Relay I/O Interface
 0a0b  Cybex Computer Products Co.
+0a0d  Servergy, Inc
+	2514  CTS-1000 Internal Hub
 0a11  Xentec, Inc.
 0a12  Cambridge Silicon Radio, Ltd
    0001  Bluetooth Dongle (HCI mode)
@@ -10232,6 +10566,7 @@
    0009  Nanosira4-EDR WHQL Reference Radio
    000a  Nanosira4-EDR-ROM
    000b  Nanosira5-ROM
+	0042  SPI Converter
    0043  Bluetooth Device
    0100  Casira with BlueCore2-External Module
    0101  Casira with BlueCore2-Flash Module
@@ -10253,7 +10588,7 @@
    9988  Trek2000 TD-G2
 0a17  Pentax Corp.
    0004  Optio 330
-	0006  Optio S
+	0006  Optio S / S4
    0007  Optio 550
    0009  Optio 33WR
    000a  Optio 555
@@ -10316,6 +10651,7 @@
    5023  Mass Storage Device
    5024  Mass Storage Device
    5025  Mass Storage Device
+0a4a  Ploytec GmbH
 0a4b  Fujitsu Media Devices, Ltd
 0a4c  Computex Co., Ltd
    15d9  OPTICAL MOUSE
@@ -10426,6 +10762,7 @@
    6300  Pirelli Remote NDIS Device
    bd11  TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320]
    bd13  BCM4323 802.11abgn Wireless Adapter
+	bd16  BCM4319 802.11bgn Wireless Adapter
    bd17  BCM43236 802.11abgn Wireless Adapter
    d11b  Eminent EM4045 [Broadcom 4320 USB]
 0a5d  Diatrend Corp.
@@ -10433,6 +10770,7 @@
    0009  LP2844 Printer
    0081  GK420t Label Printer
    008b  HC100 wristbands Printer
+	008c  ZP 450 Printer
    00d1  Zebra GC420d Label Printer
    930a  Printer
 0a62  MPMan
@@ -10578,6 +10916,7 @@
 0ab0  Arrow Strong Electronics Co., Ltd
 0ab1  FEIG ELECTRONIC GmbH
    0002  OBID RFID-Reader
+	0004  OBID classic-pro
 0aba  Ellisys
    8001  Tracker 110 Protocol Analyzer
    8002  Explorer 200 Protocol Analyzer
@@ -10612,6 +10951,7 @@
    c326  Namuga 1.3M Webcam
    c33f  Webcam
    c429  Lenovo ThinkCentre Web Camera
+	c42d  Lenovo IdeaCentre Web Camera
 0ac9  Micro Solutions, Inc.
    0000  Backpack CD-ReWriter
    0001  BACKPACK  2 Cable
@@ -10628,6 +10968,7 @@
    0401  Spectrum III Hybrid Smartcard Reader
    0630  Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC
    0810  SecurePIN (IDPA-506100Y) PIN Pad
+	2030  ValueMag Magnetic Stripe Reader
 0ace  ZyDAS
    1201  ZD1201 802.11b
    1211  ZD1211 802.11g
@@ -10695,17 +11036,20 @@
 0af9  Hama, Inc.
    0010  USB SightCam 100
    0011  Micro Innovations IC50C Webcam
+0afa  DMC Co., Ltd.
+	07d2  Controller Board for Projected Capacitive Touch Screen DUS3000
 0afc  Zaptronix Ltd
 0afd  Tateno Dennou, Inc.
 0afe  Cummins Engine Co.
 0aff  Jump Zone Network Products, Inc.
 0b00  INGENICO
 0b05  ASUSTek Computer, Inc.
+	0001  MeMO Pad HD 7 (CD-ROM mode)
    1101  Mass Storage (UISDMC4S)
    1706  WL-167G v1 802.11g Adapter [Ralink RT2571]
    1707  WL-167G v1 802.11g Adapter [Ralink RT2571]
    1708  Mass Storage Device
-	170b  Mass Storage Device
+	170b  Multi card reader
    170c  WL-159g 802.11bg
    170d  802.11b/g Wireless Network Adapter
    1712  BT-183 Bluetooth 2.0+EDR adapter
@@ -10736,18 +11080,29 @@
    1779  My Cinema U3100 Mini Plus [AF9035A]
    1784  USB-N13 802.11n Network Adapter (rev. A1) [Ralink RT3072]
    1786  USB-N10 802.11n Network Adapter [Realtek RTL8188SU]
+	1788  BT-270 Bluetooth Adapter
    1791  WL-167G v3 802.11n Adapter [Realtek RTL8188SU]
    179d  USB-N53 802.11abgn Network Adapter [Ralink RT3572]
    179e  Eee Note EA800 (network mode)
    179f  Eee Note EA800 (tablet mode)
+	17a0  Xonar U3 sound card
    17a1  Eee Note EA800 (mass storage mode)
    17ab  USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]
+	17ba  N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]
+	17c7  WL-330NUL
+	17c9  USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
+	17d1  AC51 802.11a/b/g/n/ac Wireless Adapter [Mediatek MT7610/Ralink RT2870]
    4c80  Transformer Pad TF300TG
    4c90  Transformer Pad Infinity TF700
    4c91  Transformer Pad Infinity TF700 (Debug mode)
+	4ca0  Transformer Pad TF701T
+	4ca1  Transformer Pad TF701T (Debug mode)
    4d00  Transformer Prime TF201
    4d01  Transformer Prime TF201 (debug mode)
    4daf  Transformer Pad Infinity TF700 (Fastboot)
+	5410  MeMO Pad HD 7 (MTP mode)
+	5412  MeMO Pad HD 7 (PTP mode)
+	550f  ASUS fonepad 7
    6101  Cable Modem
    620a  Remote NDIS Device
    b700  Broadcom Bluetooth 2.1
@@ -10762,8 +11117,11 @@
 0b0d  ProjectLab
    0000  CenturyCD
 0b0e  GN Netcom
+	034c  Jabra UC Voice 750 MS
    0420  Jabra SPEAK 510
+	094d  GN Netcom / Jabra REVO Wireless
    1022  Jabra PRO 9450, Type 9400BS (DECT Headset)
+	2007  GN 2000 Stereo Corded Headset
    620c  Jabra BT620s
    9330  Jabra GN9330 Headset
 0b0f  AVID Technology
@@ -10784,6 +11142,7 @@
    0006  SM Media-Shuttle Card Reader
 0b33  Contour Design, Inc.
    0020  ShuttleXpress
+	0700  RollerMouse Pro
 0b37  Hitachi ULSI Systems Co., Ltd
 0b38  Gear Head
    0003  Keyboard
@@ -10839,6 +11198,9 @@
    300c  TT-connect T-3650 CI
    300d  TT-connect CT-3650 CI
    300e  TT-connect C-2400
+	3011  TT-connect S2-4600
+	3012  TT-connect CT2-4650 CI
+	3014  TT-TVStick CT2-4400
 0b49  ASCII Corp.
    064f  Trance Vibrator
 0b4b  Pine Corp. Ltd.
@@ -10916,6 +11278,7 @@
 0b95  ASIX Electronics Corp.
    1720  10/100 Ethernet
    1780  AX88178
+	1790  AX88179 Gigabit Ethernet
    7720  AX88772
    772a  AX88772A Fast Ethernet
    772b  AX88772B
@@ -10949,6 +11312,7 @@
    0118  U5 802.11g Adapter
    011b  Wireless MAXg Adapter [Broadcom 4320]
    0121  USR5423 802.11bg Wireless Adapter [ZyDAS ZD1211B]
+	0303  USR5637 56K Faxmodem
    6112  FaxModem Model 5633
 0bb0  Concord Camera Corp.
    0100  Sound Vision Stream
@@ -10959,6 +11323,7 @@
    6098  USB Cable Modem
 0bb3  Ofuji Technology
 0bb4  HTC (High Tech Computer Corp.)
+	0001  Android Phone via mass storage [Wiko Cink Peax 2]
    00ce  mmO2 XDA GSM/GPRS Pocket PC
    00cf  SPV C500 Smart Phone
    0a01  PocketPC Sync
@@ -11131,6 +11496,7 @@
    0bce  Vario MDA
    0c01  Dream / ADP1 / G1 / Magic / Tattoo
    0c02  Dream / ADP1 / G1 / Magic / Tattoo (Debug)
+	0c03  Android Phone [Fairphone First Edition (FP1)]
    0c13  Diamond
    0c1f  Sony Ericsson XPERIA X1
    0c5f  Snap
@@ -11144,10 +11510,15 @@
    0c9e  Incredible
    0ca2  Desire HD (debug mode)
    0ca5  Android Phone [Evo Shift 4G]
+	0cae  T-Mobile MyTouch 4G Slide [Doubleshot]
+	0dea  M7_UL [HTC One]
+	0f64  Desire 601
    0ff8  Desire HD (Tethering Mode)
    0ff9  Desire / Desire HD / Hero / Thunderbolt (Charge Mode)
    0ffe  Desire HD (modem mode)
    0fff  Android Fastboot Bootloader
+	2008  Android Phone via MTP [Wiko Cink Peax 2]
+	200b  Android Phone via PTP [Wiko Cink Peax 2]
 0bb5  Murata Manufacturing Co., Ltd
 0bb6  Network Alchemy
 0bb7  Joytech Computer Co., Ltd
@@ -11167,11 +11538,20 @@
    2200  FreeAgent Go FW
    2300  Expansion Portable
    2320  USB 3.0 bridge [Portable Expansion Drive]
+	2321  Expansion Portable
+	2340  FreeAgent External Hard Drive
+	3000  FreeAgent Desktop
    3008  FreeAgent Desk 1TB
+	3101  FreeAgent XTreme 640GB
+	3312  SRD00F2 Expansion Desktop Drive (STBV)
    3320  SRD00F2 [Expansion Desktop Drive]
    3332  Expansion
+	5020  FreeAgent GoFlex
    5021  FreeAgent GoFlex USB 2.0
+	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
@@ -11179,6 +11559,10 @@
    a003  Backup Plus
    a0a1  Backup Plus Desktop
    a0a4  Backup Plus Desktop Drive
+	ab00  Slim Portable Drive
+	ab20  Backup Plus Portable Drive
+	ab21  Backup Plus Slim
+	ab31  Backup Plus Desktop Drive (5TB)
 0bc3  IPWireless, Inc.
    0001  UMTS-TDD (TD-CDMA) modem
 0bc4  Microcube Corp.
@@ -11235,11 +11619,16 @@
    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
+	1724  RTL8723AU 802.11n WLAN Adapter
    2831  RTL2831U DVB-T
    2832  RTL2832U DVB-T
    2838  RTL2838 DVB-T
+	5730  HP 2.0MP High Definition Webcam
+	5775  HP "Truevision HD" laptop camera
    8150  RTL8150 Fast Ethernet Adapter
    8151  RTL8151 Adapteon Business Mobile Networks BV
    8171  RTL8188SU 802.11n WLAN Adapter
@@ -11256,6 +11645,7 @@
    8197  RTL8187B Wireless Adapter
    8198  RTL8187B Wireless Adapter
    8199  RTL8187SU 802.11g WLAN Adapter
+	8812  RTL8812AU 802.11a/b/g/n/ac WLAN Adapter
 0bdb  Ericsson Business Mobile Networks BV
    1000  BV Bluetooth Device
    1002  Bluetooth Device 1.2
@@ -11366,7 +11756,7 @@
    0012  Bluetooth Device(BC04-External)
    0018  Bluetooth Device(BC04-External)
    0019  Bluetooth Device
-	0021  Bluetooth Device
+	0021  Bluetooth Device (V2.1+EDR)
    0c24  Bluetooth Device(SAMPLE)
    ffff  Bluetooth module with BlueCore in DFU mode
 0c25  Sampo Corp.
@@ -11384,6 +11774,7 @@
    0720  Metrologic MS7120 Barcode Scanner (bi-directional serial mode)
    0b61  Vuquest 3310g
    0b6a  Vuquest 3310 Area-Imaging Scanner
+	0b81  Barcode scanner Voyager 1400g Series
 0c35  Eagletron, Inc.
 0c36  E Ink Corp.
 0c37  e.Digital
@@ -11401,6 +11792,7 @@
    41d9  i1 phone
 0c45  Microdia
    0011  EBUDDY
+	0520  MaxTrack Wireless Mouse
    1018  Compact Flash storage memory card reader
    1020  Mass Storage Reader
    1028  Mass Storage Reader
@@ -11519,7 +11911,9 @@
    62be  PC Camera with Microphone (SN9C202 + OV7663)
    62c0  Sonix USB 2.0 Camera
    62e0  MSI Starcam Racer
+	6300  PC Microscope camera
    6310  Sonix USB 2.0 Camera
+	6340  Camera
    6341  Defender G-Lens 2577 HD720p Camera
    63e0  Sonix Integrated Webcam
    63f1  Integrated Webcam
@@ -11529,9 +11923,12 @@
    6417  Integrated Webcam
    6419  Integrated Webcam
    641d  1.3 MPixel Integrated Webcam
+	643f  Dell Integrated HD Webcam
+	644d  1.3 MPixel Integrated Webcam
    6480  Sonix 1.3 MP Laptop Integrated Webcam
    648b  Integrated Webcam
    64bd  Sony Visual Communication Camera
+	7401  TEMPer Temperature Sensor
    7402  TEMPerHUM Temperature & Humidity Sensor
    7403  Foot Switch
    8000  DC31VC
@@ -11544,6 +11941,9 @@
 0c4b  Reiner SCT Kartensysteme GmbH
    0100  cyberJack e-com/pinpad
    0300  cyberJack pinpad(a)
+	0400  cyberJack e-com(a)
+	0401  cyberJack pinpad(a2)
+	0500  cyberJack RFID standard dual interface smartcard reader
    0501  cyberJack RFID comfort dual interface smartcard reader
    9102  cyberJack RFID basis contactless smartcard reader
 0c4c  Needham's Electronics
@@ -11796,8 +12196,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)
@@ -11817,6 +12231,7 @@
    20ff  AR7010 (no firmware)
    3000  AR3011 Bluetooth (no firmware)
    3002  AR3011 Bluetooth
+	3004  AR3012 Bluetooth 4.0
    3005  AR3011 Bluetooth
    3008  Bluetooth (AR3011)
    7015  TP-Link TL-WN821N v3 / TL-WN822N v2 802.11n [Atheros AR7010+AR9287]
@@ -11875,9 +12290,13 @@
 0d34  Rearden Steel Technologies
 0d35  Dah Kun Co., Ltd
 0d3a  Posiflex Technologies, Inc.
+	0206  Series 3xxx Cash Drawer
+	0207  Series 3xxx Cash Drawer
+	0500  Magnetic Stripe Reader
 0d3c  Sri Cable Technology, Ltd
 0d3d  Tangtop Technology Co., Ltd
    0001  HID Keyboard
+	0040  PS/2 Adapter
 0d3e  Fitcom, inc.
 0d3f  MTS Systems Corp.
 0d40  Ascor, Inc.
@@ -11904,6 +12323,7 @@
    7000  OneTouch
    7010  OneTouch
    7100  OneTouch II 300GB External Hard Disk
+	7310  OneTouch 4
    7410  Mobile Hard Disk Drive (1TB)
    7450  Basics Portable USB Device
 0d4a  NF Corp.
@@ -11973,6 +12393,7 @@
 0d77  Power Sentry/Newpoint
 0d78  Japan Distributor Corp.
 0d7a  MARX Datentechnik GmbH
+	0001  CrypToken
 0d7b  Wellco Technology Co., Ltd
 0d7c  Taiwan Line Tek Electronic Co., Ltd
 0d7d  Phison Electronics Corp.
@@ -12109,6 +12530,7 @@
 0da3  Nippon Electro-Sensory Devices Corp.
 0da4  Polar Electro OY
    0001  Interface
+	0008  Loop
 0da7  IOGear, Inc.
 0da8  softDSP Co., Ltd
    0001  SDS 200A Oscilloscope
@@ -12118,6 +12540,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
@@ -12155,6 +12578,9 @@
 0db4  Chung Fu Chen Yeh Enterprise Corp.
 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]
 0dbe  Jiuh Shiuh Precision Industry Co., Ltd
@@ -12178,6 +12604,7 @@
    0041  Mass Storage Device
    0042  Mass Storage Device
    0101  Hi-Speed Mass Storage Device
+	0209  SK-3500 S2
    020a  Oyen Digital MiniPro 2.5" hard drive enclosure
 0dc5  SDK Co., Ltd
 0dc6  Precision Squared Technology Corp.
@@ -12279,6 +12706,7 @@
    005d  WLA-2000 v1.001 WLAN [RTL8191SU]
    0060  WLA-4000 802.11bgn [Ralink RT3072]
    0062  WLA-5000 802.11abgn [Ralink RT3572]
+	0072  AX88179 Gigabit Ethernet [Sitecom]
    061c  LN-028 Network USB 2.0 Adapter
    21f4  44 St Bluetooth Device
    2200  Sitecom bluetooth2.0 class 2 dongle CN-512
@@ -12309,6 +12737,8 @@
    9041  802.11n Wireless USB Card
 0e0c  Gesytec
    0101  LonUSB LonTalk Network Adapter
+0e0d  PicoQuant GmbH
+	0003  PicoHarp 300
 0e0f  VMware, Inc.
    0001  Device
    0002  Virtual USB Hub
@@ -12420,6 +12850,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
@@ -12438,6 +12870,7 @@
    1417  A43 IT
    14ad  97 Titanium HD
    150e  80 G9
+	3001  40 Titanium
 0e7b  On-Tech Industry Co., Ltd
 0e7e  Gmate, Inc.
    0001  Yopy 3000 PDA
@@ -12449,12 +12882,14 @@
    0003  MT6227 phone
    0004  MT6227 phone
    0023  S103
-	1806  Samsung SE-208AB Slim Portable DVD Writer
+	1806  Samsung SE-208 Slim Portable DVD Writer
    1836  Samsung SE-S084 Super WriteMaster Slim External DVD writer
+	2000  MT65xx Preloader
    3329  Qstarz BT-Q1000XT
+	763e  MT7630e Bluetooth Adapter
 0e8f  GreenAsia Inc.
    0003  MaxFire Blaze2
-	0012  USB Wireless 2.4GHz Gamepad
+	0012  Joystick/Gamepad
    0016  4 port USB 1.1 hub UH-174
    0020  USB to PS/2 Adapter
    0021  Multimedia Keyboard Controller
@@ -12479,7 +12914,7 @@
 0ea0  Ours Technology, Inc.
    2126  7-in-1 Card Reader
    2153  SD Card Reader Key
-	2168  Transcend JetFlash 2.0 / Astone USB Drive
+	2168  Transcend JetFlash 2.0 / Astone USB Drive / Intellegent Stick 2.0
    6803  OTI-6803 Flash Disk
    6808  OTI-6808 Flash Disk
    6828  OTI-6828 Flash Disk
@@ -12499,7 +12934,10 @@
 0eb3  Saint Technology Corp.
 0eb7  Endor AG
 0eb8  Mettler Toledo
+	2200  Ariva Scale
    f000  PS60 Scale
+0ebb  Thermo Fisher Scientific
+	0002  FT-IR Spectrometer
 0ebe  VWeb Corp.
 0ebf  Omega Technology of Taiwan, Inc.
 0ec0  LHI Technology (China) Co., Ltd
@@ -12540,6 +12978,8 @@
 0eef  D-WAV Scientific Co., Ltd
    0001  eGalax TouchScreen
    0002  Touchscreen Controller(Professional)
+	7200  Touchscreen Controller
+	a802  eGalaxTouch EXC7920
 0ef0  Hitachi Cable, Ltd
 0ef1  Aichi Micro Intelligent Corp.
 0ef2  I/O Magic Corp.
@@ -12577,6 +13017,8 @@
    2040  Machine Test System
 0f12  Mars Engineering Corp.
 0f13  Acetek Technology Co., Ltd
+0f14  Ingenico
+	0012  Vital'Act 3S
 0f18  Finger Lakes Instrumentation
    0002  CCD
    0006  Focuser
@@ -12605,6 +13047,8 @@
 0f32  YFC-BonEagle Electric Co., Ltd
 0f37  Kokuyo Co., Ltd
 0f38  Nien-Yi Industrial Corp.
+0f39  TG3 Electronics
+	0876  Keyboard [87 Francium Pro]
 0f3d  Airprime, Incorporated
    0112  CDMA 1xEVDO PC Card, PC 5220
 0f41  RDC Semiconductor Co., Ltd
@@ -12634,6 +13078,7 @@
    1001  Targus Mini Trackball Optical Mouse
 0f63  LeapFrog Enterprises
    0010  Leapster Explorer
+	0022  Leap Reader
    0500  Fly Fusion
    0600  Leap Port Turbo
    0700  POGO
@@ -12663,6 +13108,7 @@
    0403  NDS Capture
    0404  NDS Emulator (Lite)
 0f73  DFI
+0f78  Guntermann & Drunck GmbH
 0f7c  DQ Technology, Inc.
 0f7d  NetBotz, Inc.
 0f7e  Fluke Corp.
@@ -12708,7 +13154,7 @@
    0006  Blackberry Pearl
    0008  Blackberry Pearl
    8001  Blackberry Handheld
-	8004  Blackberry Handheld
+	8004  Blackberry
    8007  Blackberry Handheld
    8010  Blackberry Playbook (Connect to Windows mode)
    8011  Blackberry Playbook (Connect to Mac mode)
@@ -12736,6 +13182,8 @@
    3137  Xperia X10 mini
    3138  Xperia X10 mini pro
    3149  Xperia X8
+	514f  Xperia arc S [Adb-Enable Mode]
+	5169  Xperia S [Adb-Enable Mode]
    5177  Xperia Ion [Debug Mode]
    518c  C1605 [Xperia E dual] MTD mode
    614f  Xperia X12 (debug mode)
@@ -12745,7 +13193,7 @@
    7166  Xperia Mini Pro (Tethering mode)
    7177  Xperia Ion [Tethering]
    8004  9000 Phone [Mass Storage]
-	adde  Boot loader
+	adde  C2005 (Xperia M dual) in service mode
    d008  V800-Vodafone 802SE Phone
    d016  K750i Phone
    d017  K608i Phone
@@ -12766,7 +13214,9 @@
    d0cf  MD300 Mobile Broadband Modem
    d0d4  C902 Phone [Modem]
    d0e1  MD400 Mobile Broadband Modem
+	d12a  U100i Yari Phone
    d12e  Xperia X10
+	d14e  J108i Cedar
    e000  K810 (PictBridge mode)
    e039  K800i (msc mode)
    e042  W810i Phone
@@ -12790,11 +13240,14 @@
    e161  Xperia Ray
    e166  Xperia Mini Pro
    e167  XPERIA mini
+	e19b  C2005 [Xperia M dual] (Mass Storage)
+	f0fa  Liveview micro display MN800 in DFU mode
 0fcf  Dynastream Innovations, Inc.
    1003  ANT Development Board
-	1004  ANT2USB
+	1004  ANTUSB Stick
    1006  ANT Development Board
-	1008  Mini stick Suunto
+	1008  ANTUSB2 Stick
+	1009  ANTUSB-m Stick
 0fd0  Tulip Computers B.V.
 0fd1  Giant Electronics Ltd.
 0fd2  Seac Banche
@@ -12813,6 +13266,9 @@
 0fda  Quantec Networks GmbH
    0100  quanton flight control
 0fdc  Micro Plus
+0fde  Oregon Scientific
+	ca01  WMRS200 weather station
+	ca05  CM160
 0fe0  Osterhout Design Group
    0100  Bluetooth Mouse
    0101  Bluetooth IMU
@@ -12844,6 +13300,7 @@
    ff00  OEM
 0fff  Aopen, Inc.
 1000  Speed Tech Corp.
+	153b  TerraTec Electronic GmbH
 1001  Ritronics Components (S) Pte., Ltd
 1003  Sigma Corp.
    0003  SD14
@@ -12855,24 +13312,28 @@
    6018  GM360/GD510/GW520/KP501
    618e  Ally/Optimus One/Vortex (debug mode)
    618f  Ally/Optimus One
+	61c5  P880 / Charge only
    61c6  Vortex (msc)
    61cc  Optimus S
    61f1  Optimus Android Phone [LG Software mode]
-	61f9  V909 G-Slate
+	61f9  Optimus (Various Models) MTP Mode
    61fc  Optimus 3
    61fe  Optimus Android Phone [USB tethering mode]
    6300  Optimus Android Phone
    631c  Optimus Android Phone [MTP mode]
+	631d  Optimus Android Phone (Camera/PTP Mode)
    631e  Optimus Android Phone [Camera/PTP mode]
+	631f  Optimus Android Phone (Charge Mode)
    6356  Optimus Android Phone [Virtual CD mode]
    6800  CDMA Modem
    7000  LG LDP-7024D(LD)USB
+	91c8  P880 / USB tethering
    a400  Renoir (KC910)
 1005  Apacer Technology, Inc.
    1001  MP3 Player
    1004  MP3 Player
    1006  MP3 Player
-	b113  Handy Steno 2.0/HT203
+	b113  Handy Steno/AH123 / Handy Steno 2.0/HT203
    b223  CD-RW + 6in1 Card Reader Digital Storage / Converter
 1006  iRiver, Ltd.
    3001  iHP-100
@@ -12934,12 +13395,14 @@
 1032  C-One Technology Corp.
 1033  Nucam Corp.
    0068  3,5'' HDD case MD-231
-1038  Ideazon, Inc.
-	0100  Zboard
-	1361  Sensei
+1038  SteelSeries ApS
+	0100  Ideazon Zboard
+	1361  Ideazon Sensei
 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
@@ -12988,6 +13451,8 @@
    0010  Yubikey
    0110  Yubikey NEO OTP
    0111  Yubikey NEO OTP+CCID
+	0112  Yubikey NEO CCID
+	0200  U2F Gnubby
    0211  Gnubby
 1053  Immanuel Electronics Co., Ltd
 1054  BMS International Beheer N.V.
@@ -13000,28 +13465,52 @@
    0200  FireWire USB Combo
    0400  External HDD
    0500  hub
-	0702  Passport External HDD
-	0704  Passport External HDD
-	070a  My Passport Essential SE
-	071a  My Passport
-	0730  My Passport
-	0740  My Passport
-	0742  My Passport Essential SE
-	0748  My Passport 1TB USB 3.0
+	0701  WD Passport (WDXMS)
+	0702  WD Passport (WDXMS)
+	0704  My Passport Essential (WDME)
+	0705  My Passport Elite (WDML)
+	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)
+	0732  My Passport Essential SE (WDBGYS)
+	0740  My Passport Essential (WDBACY)
+	0741  My Passport Ultra
+	0742  My Passport Essential SE (WDBGYS)
+	0748  My Passport (WDBKXH, WDBY8L)
+	07a8  My Passport (WDBBEP), My Passport for Mac (WDBLUZ)
+	0810  My Passport Ultra (WDBZFP)
+	0820  My Passport Ultra (WDBMWV, WDBZFP)
    0900  MyBook Essential External HDD
-	0901  MyBook External HDD
+	0901  My Book Essential Edition (Green Ring) (WDG1U)
+	0902  My Book Pro Edition (WDG1T)
    0903  My Book Premium Edition
-	0910  MyBook Essential External HDD
-	1001  External Hard Disk [Elements]
-	1003  Elements 1000 GB
-	1010  Elements External HDD
-	1021  Elements 2TB
-	1023  Elements SE
+	0910  My Book Essential Edition (Green Ring) (WDG1U)
+	1001  Elements Desktop (WDE1U)
+	1003  WD Elements Desktop (WDE1UBK)
+	1010  Elements Portable (WDBAAR)
+	1021  Elements Desktop (WDBAAU)
+	1023  Elements SE Portable (WDBABV)
+	1042  Elements SE Portable (WDBPCK)
+	1048  Elements Portable (WDBU6Y)
+	107c  Elements Desktop (WDBWLG)
+	10a2  Elements SE Portable (WDBPCK)
+	10a8  Elements Portable (WDBUZG)
+	10b8  Elements Portable (WDBU6Y, WDBUZG)
+	1100  My Book Essential Edition 2.0 (WDH1U)
+	1102  My Book Home Edition (WDH1CS)
    1103  My Book Studio
-	1104  MyBook Mirror Edition External HDD
+	1104  My Book Mirror Edition (WDH2U)
    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)
+	1230  My Book (WDBFJK0030HBK)
 1059  Giesecke & Devrient GmbH
    000b  StarSign Bio Token 3.0
 105c  Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd
@@ -13111,6 +13600,7 @@
 106f  Money Controls
    0009  CT10x Coin Transaction
    000a  CR10x Coin Recycler
+	000c  Xchange
 1076  GCT Semiconductor, Inc.
    0031  Bluetooth Device
    0032  Bluetooth Device
@@ -13132,6 +13622,8 @@
 108e  Lotes Co., Ltd.
 1099  Surface Optics Corp.
 109a  DATASOFT Systems GmbH
+109b  Hisense
+	9118  Medion P4013 Mobile
 109f  eSOL Co., Ltd
    3163  Trigem Mobile SmartDisplay84
    3164  Trigem Mobile SmartDisplay121
@@ -13140,7 +13632,38 @@
 10a9  SK Teletech Co., Ltd
    1102  Sky Love Actually IM-U460K
    1104  Sky Vega IM-A650S
+	1105  VEGA Android composite
+	1106  VEGA Android composite
+	1107  VEGA Android composite
+	1108  VEGA Android composite
+	1109  VEGA Android composite
    6021  SIRIUS alpha
+	6031  Pantech Android composite
+	6032  Pantech Android composite
+	6033  Pantech Android composite
+	6034  Pantech Android composite
+	6035  Pantech Android composite
+	6036  Pantech Android composite
+	6037  Pantech Android composite
+	6050  Pantech Android composite
+	6051  Pantech Android composite
+	6052  Pantech Android composite
+	6053  Pantech Android composite
+	6054  Pantech Android composite
+	6055  Pantech Android composite
+	6056  Pantech Android composite
+	6057  Pantech Android composite
+	6058  Pantech Android composite
+	6059  Pantech Android composite
+	6080  MHS291LVW LTE Modem [Verizon Jetpack 4G LTE Mobile Hotspot MHS291L] (Zero CD Mode)
+	6085  MHS291LVW LTE Modem [Verizon Jetpack 4G LTE Mobile Hotspot MHS291L] (Modem Mode)
+	7031  Pantech Android composite
+	7032  Pantech Android composite
+	7033  Pantech Android composite
+	7034  Pantech Android composite
+	7035  Pantech Android composite
+	7036  Pantech Android composite
+	7037  Pantech Android composite
 10aa  Cables To Go
 10ab  USI Co., Ltd
    1002  Bluetooth Device
@@ -13173,6 +13696,9 @@
    1427  Ethernet
 10bf  SmartHome
    0001  SmartHome PowerLinc
+10c3  Universal Laser Systems, Inc.
+	00a4  ULS PLS Series Laser Engraver Firmware Loader
+	00a5  ULS Print Support
 10c4  Cygnal Integrated Products, Inc.
    0002  F32x USBXpress Device
    0003  CommandIR
@@ -13190,12 +13716,16 @@
    8460  Sangoma Wanpipe VoiceTime
    8461  Sangoma U100
    8477  Balluff RFID Reader
+	8496  SiLabs Cypress FW downloader
+	8497  SiLabs Cypress EVB
    8605  dilitronics ESoLUX solar lighting controller
    86bc  C8051F34x AudioDelay [AD-340]
    8789  C8051F34x Extender & EDID MGR [EMX-DVI]
    87be  C8051F34x HDMI Audio Extractor [EMX-HD-AUD]
    8863  C8051F34x Bootloader
    8897  C8051F38x HDMI Splitter [UHBX]
+	8918  C8051F38x HDMI Audio Extractor [VSA-HA-DP]
+	8973  C8051F38x HDMI Splitter [UHBX-8X]
    ea60  CP210x UART Bridge / myAVR mySmartUSB light
    ea61  CP210x UART Bridge
    ea70  CP210x UART Bridge
@@ -13323,6 +13853,7 @@
 113d  Mapower Electronics Co., Ltd
 1141  V One Multimedia, Pte., Ltd
 1142  CyberScan Technologies, Inc.
+	0709  Cyberview High Speed Scanner
 1145  Japan Radio Company
    0001  AirH PHONE AH-J3001V/J3002V
 1146  Shimane SANYO Electric Co., Ltd.
@@ -13333,6 +13864,7 @@
 114c  Tinius Olsen Testing Machine Co., Inc.
 114d  Alpha Imaging Technology Corp.
 114f  Wavecom
+	1234  Fastrack Xtend FXT001 Modem
 115b  Salix Technology Co., Ltd.
 1162  Secugen Corp.
 1163  DeLorme Publishing, Inc.
@@ -13396,7 +13928,7 @@
    6832  MC8780 Device
    6833  MC8781 Device
    683a  MC8785 Device
-	683c  MC8790 Device
+	683c  Mobile Broadband 3G/UMTS (MC8790 Device)
    6850  AirCard 880 Device
    6851  AirCard 881 Device
    6852  AirCard 880E Device
@@ -13419,6 +13951,8 @@
    9008  Gobi 2000 Wireless Modem
    9009  Gobi 2000 Wireless Modem
    900a  Gobi 2000 Wireless Modem
+	9055  Gobi 9x15 Multimode 3G/4G LTE Modem (NAT mode)
+	9057  Gobi 9x15 Multimode 3G/4G LTE Modem (IP passthrough mode)
 119a  ZHAN QI Technology Co., Ltd
 119b  ruwido austria GmbH
    0400  Infrared Keyboard V2.01
@@ -13433,8 +13967,14 @@
 11ac  Nike
    6565  FuelBand
 11b0  ATECH FLASH TECHNOLOGY
+	6208  PRO-28U
+11be  R&D International NV
+	f0a0  Martin Maxxyz DMX
 11c5  Inmax
    0521  IMT-0521 Smartcard Reader
+11ca  VeriFone Inc
+	0207  PIN Pad VX 810
+	0220  PIN Pad VX 805
 11db  Topfield Co., Ltd.
    1000  PVR
    1100  PVR
@@ -13445,10 +13985,11 @@
    0004  X75
    0005  SXG75/EF81
    0008  UMTS/HSDPA Data Card
+	0101  RCU Connect
 11f6  Prolific
    2001  Willcom WSIM
 11f7  Alcatel (?)
-	02df  TD10 Mobile phone USB cable
+	02df  Serial cable (v2) for TD-10 Mobile Phone
 1203  TSC Auto ID Technology Co., Ltd
    0140  TTP-245C
 1209  InterBiometrics
@@ -13471,6 +14012,7 @@
 1228  Datapaq Limited
    0012  Q18 Data Logger
    0015  TPaq21/MPaq21 Datalogger
+	584c  XL2 Logger
 1230  Chipidea-Microelectronica, S.A.
 1233  Denver Electronics
    5677  FUSB200 mp3 player
@@ -13478,19 +14020,49 @@
    0000  Neural Impulse Actuator Prototype 1.0 [NIA]
    4321  Human Interface Device
    ed02  Emotiv EPOC Developer Headset Wireless Dongle
-1235  Novation EMS
-	0001  ReMOTE Audio/XStation
+1235  Focusrite-Novation
+	0001  ReMOTE Audio/XStation First Edition
    0002  Speedio
-	0003  ReMOTE ZeRO SL
+	0003  RemoteSL + ZeroSL
+	0004  ReMOTE LE
+	0005  XIOSynth [First Edition]
+	0006  XStation
+	0007  XIOSynth
+	0008  ReMOTE SL Compact
+	0009  nIO
+	000a  Nocturn
+	000b  ReMOTE SL MkII
+	000c  ZeRO MkII
+	000e  Launchpad
+	0010  Saffire 6
+	0011  Ultranova
+	0012  Nocturn Keyboard
+	0013  VRM Box
+	0014  VRM Box Audio Class (2-out)
+	0015  Dicer
+	0016  Ultranova
+	0018  Twitch
+	0019  Impulse 25
+	001a  Impulse 49
+	001b  Impulse 61
    4661  ReMOTE25
+	8000  Scarlett 18i6
+	8002  Scarlett 8i6
    8006  Focusrite Scarlett 2i2
+	8008  Saffire 6
+	800a  Scarlett 2i4
+	800c  Scarlett 18i20
+	800e  iTrack Solo
+	8010  Forte
+	8012  Scarlett 6i6
+	8014  Scarlett 18i8
 1241  Belkin
    0504  Wireless Trackball Keyboard
    1111  Mouse
    1122  Typhoon Stream Optical Mouse USB+PS/2
-	1155  PS2/USB Browser Combo Mouse
+	1155  Memorex Optical ScrollPro Mouse SE MX4600
    1166  MI-2150 Trust Mouse
-	1177  F8E842-DL Mouse
+	1177  Mouse [HT82M21A]
    1503  Keyboard
    1603  Keyboard
    f767  Keyboard
@@ -13508,11 +14080,14 @@
 125f  A-DATA Technology Co., Ltd.
    312a  Superior S102
    312b  Superior S102 Pro
+	a15a  DashDrive Durable HD710 portable HDD various size
+	a22a  DashDrive Elite HE720 500GB
    a91a  Portable HDD CH91
    c08a  C008 Flash Drive
    c81a  Flash drive
    c93a  4GB Pen Drive
    c96a  C906 Flash Drive
+	cb10  Dash Drive UV100
 1260  Standard Microsystems Corp.
    ee22  SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887]
 1264  Covidien Energy-based Devices
@@ -13566,6 +14141,7 @@
    0130  PDM
    0150  CMS10GI (Golf)
 1286  Marvell Semiconductor, Inc.
+	00bc  Marvell JTAG Probe
    1fab  88W8338 [Libertas] 802.11g
    2001  88W8388 802.11a/b/g WLAN
    2006  88W8362 802.11n WLAN
@@ -13579,6 +14155,7 @@
    0002  F5U002 Parallel Port [uss720]
    2101  104-key keyboard
 1294  RISO KAGAKU CORP.
+	1320  Webmail Notifier
 129b  CyberTAN Technology
    160b  Siemens S30853-S1031-R351 802.11g Wireless Adapter [Atheros AR5523]
    160c  Siemens S30853-S1038-R351 802.11g Wireless Adapter [Atheros AR5523]
@@ -13595,9 +14172,13 @@
    0120  RedOctane Drum Kit for PlayStation(R)3
    0200  Harmonix Guitar for PlayStation(R)3
    0210  Harmonix Drum Kit for PlayStation(R)3
+12bd  Gembird
+	d012  JPD Shockforce gamepad
 12c4  Autocue Group Ltd
    0006  Teleprompter Two-button Hand Control (v1)
    0008  Teleprompter Foot Control (v1)
+12cf  DEXIN
+	0170  Tt eSPORTS BLACK Gaming mouse
 12d1  Huawei Technologies Co., Ltd.
    1001  E169/E620/E800 HSDPA Modem
    1003  E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem
@@ -13609,6 +14190,7 @@
    1037  Ideos
    1038  Ideos (debug mode)
    1039  Ideos (tethering mode)
+	1404  EM770W miniPCI WCDMA Modem
    1406  E1750
    140b  EC1260 Wireless Data Modem HSD USB Card
    140c  E180v
@@ -13621,7 +14203,9 @@
    14c9  K3770 3G Modem
    14cf  K3772
    14d1  K3770 3G Modem (Mass Storage Mode)
+	14db  E353/E3131
    14f1  Gobi 3000 HSPA+ Modem
+	14fe  Modem (Mass Storage Mode)
    1501  Pulse
    1505  E398 LTE/UMTS/GSM Modem/Networkcard
    1506  Modem/Networkcard
@@ -13629,17 +14213,23 @@
    1520  K3765 HSPA
    1521  K4505 HSPA+
    155a  R205 Mobile WiFi (CD-ROM mode)
+	1575  K5150 LTE modem
+	15ca  E3131 3G/UMTS/HSPA+ Modem (Mass Storage Mode)
    1805  AT&T Go Phone U2800A phone
    1c05  E173s 3G broadband stick (modem on)
    1c0b  E173s 3G broadband stick (modem off)
    1c20  R205 Mobile WiFi (Charging)
    1d50  ET302s TD-SCDMA/TD-HSDPA Mobile Broadband
+	1f01  E353/E3131 (Mass storage mode)
+	1f16  K5150 LTE modem (Mass Storage Mode)
    380b  WiMAX USB modem(s)
 12d2  LINE TECH INDUSTRIAL CO., LTD.
 12d6  EMS Dr. Thomas Wuensche
    0444  CPC-USB/ARM7
    0888  CPC-USB/M16C
 12d7  BETTER WIRE FACTORY CO., LTD.
+12d8  Araneus Information Systems Oy
+	0001  Alea I True Random Number Generator
 12e6  Waldorf Music GmbH
    0013  Blofeld
 12ef  Tapwave, Inc.
@@ -13654,7 +14244,7 @@
    0101  Advanced RC Servo Controller
 1307  Transcend Information, Inc.
    0163  256MB/512MB/1GB Flash Drive
-	0165  2GB/4GB Flash Drive
+	0165  2GB/4GB/8GB Flash Drive
    0190  Ut190 8 GB Flash Drive with MicroSD reader
    0310  SD/MicroSD CardReader [hama]
    0330  63-in-1 Multi-Card Reader/Writer
@@ -13668,6 +14258,21 @@
    0001  Class 1 Bluetooth Dongle
 1312  ICS Electronics
 1313  ThorLabs
+	0010  LC1 Linear Camera (Jungo)
+	0011  SP1 Spectrometer (Jungo)
+	0012  SP2 Spectrometer (Jungo)
+	0110  LC1 Linear Camera (VISA)
+	0111  SP1 Spectrometer (VISA)
+	0112  SP2 Spectrometer (VISA)
+	8001  TXP-Series Slot (TXP5001, TXP5004)
+	8012  BC106 Camera Beam Profiler
+	8013  WFS10 Wavefront Sensor
+	8017  BC206 Camera Beam Profiler
+	8019  BP2 Multi Slit Beam Profiler
+	8020  PM300 Optical Power Meter
+	8021  PM300E Optical Power and Energy Meter
+	8022  PM320E Optical Power and Energy Meter
+	8030  ER100 Extinction Ratio Meter
    8070  PM100D
 131d  Natural Point
    0155  TrackIR 3 Pro Head Tracker
@@ -13704,6 +14309,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
@@ -13711,6 +14318,10 @@
    0203  EasiDock 200 Printer Port
    0204  Ethernet
    0304  EasiDock Ethernet
+1343  Citizen Systems
+	0003  CX / DNP DS40
+	0004  CX-W / DNP DS80
+	0005  CY / DNP DSRX
 1345  Sino Lite Technology Corp.
    001c  Xbox Controller Hub
    6006  Defender Wireless Controller
@@ -13720,6 +14331,8 @@
    0402  G2CCD2
    0403  G2/G3CCD-I KAI CCD
    0404  G2/G3/G4 CCD-F KAF CCD
+	0405  Gx CCD-I CCD
+	0406  Gx CCD-F CCD
    0410  G1-0400 CCD
    0411  G1-0800 CCD
    0412  G1-0300 CCD
@@ -13733,11 +14346,20 @@
    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
+135f  Control Development Inc.
+	0110  Linear Spectrograph
+	0111  Spectrograph - Renumerated
+	0200  Linear Spectrograph
+	0201  Spectrograph - Renumerated
+	0240  MPP Spectrograph
 1366  SEGGER
-	0101  J-Link ARM
+	0101  J-Link PLUS
 136b  STEC
+136e  Andor Technology Ltd.
+	0014  Zyla 5.5 sCMOS camera
 1370  Swissbit
    0323  Swissmemory cirrusWHITE
    6828  Victorinox Flash Drive
@@ -13765,14 +14387,19 @@
    0005  VFS301 Fingerprint Reader
    0007  VFS451 Fingerprint Reader
    0008  VFS300 Fingerprint Reader
+	0010  VFS Fingerprint sensor
    0011  VFS5011 Fingerprint Reader
+	0017  Fingerprint Reader
    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
 1390  TOMTOM B.V.
    0001  GO 520 T/GO 630/ONE XL (v9)
+	5454  Blue & Me 2
 1391  IdealTEK, Inc.
    1000  URTC-1000
 1395  Sennheiser Communications
@@ -13807,12 +14434,15 @@
    0031  AM10 v1 802.11n [Ralink RT3072]
    0039  AE1200 802.11bgn Wireless Adapter [Broadcom BCM43235]
    003a  AE2500 802.11abgn Wireless Adapter [Broadcom BCM43236]
+	003b  AE3000 802.11abgn (3x3) Wireless Adapter [Ralink RT3573]
+	003e  AE6000 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7610U]
+	003f  WUSB6300 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]
    13b1  WUSB200: Wireless-G Business Network Adapter with Rangebooster
 13b2  Alesis
    0030  Multimix 8
 13b3  Nippon Dics Co., Ltd.
 13ba  PCPlay
-	0001  König Electronic CMP-KEYPAD12 Numeric Keypad
+	0001  Konig Electronic CMP-KEYPAD12 Numeric Keypad
    0017  PS/2 Keyboard+Mouse Adapter
    0018  Barcode PCP-BCG4209
 13be  Ricoh Printing Systems, Ltd.
@@ -13868,16 +14498,22 @@
    3306  Mediao 802.11n WLAN [Realtek RTL8191SU]
    3315  Bluetooth module
    3375  Atheros AR3012 Bluetooth 4.0 Adapter
+	3392  Azurewave 43228+20702
+	3394  Bluetooth
    5070  Webcam
    5111  Integrated Webcam
    5115  Integrated Webcam
    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
    7020  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
    7022  DTV-DVB UDST7022BDA DVB-S Box(Without HID)
+13d7  Guidance Software, Inc.
+	0001  T5 PATA forensic bridge
 13dc  ALEREON, INC.
 13dd  i.Tech Dynamic Limited
 13e1  Kaibo Wire & Cable (Shenzhen) Co., Ltd.
@@ -13890,27 +14526,34 @@
 13ec  Zydacron
    0006  HID Remote Control
 13ee  MosArt
+	0001  Optical Mouse
    0003  Optical Mouse
 13fd  Initio Corporation
    0840  INIC-1618L SATA
    0841  Samsung SE-T084M DVD-RW
+	1040  INIC-1511L PATA Bridge
    1340  Hi-Speed USB to SATA Bridge
    160f  RocketFish SATA Bridge [INIC-1611]
    1640  INIC-1610L SATA Bridge
+	1669  INIC-1609PN
    1840  INIC-1608 SATA bridge
+	1e40  INIC-1610P SATA bridge
 13fe  Kingston Technology Company Inc.
    1a00  512MB/1GB Flash Drive
    1a23  512MB Flash Drive
    1d00  DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive
    1e00  Flash Drive 2 GB [ICIDU 2 GB]
    1e50  U3 Smart Drive
-	1f00  DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive
-	1f23  2Gb
+	1f00  Kingston DataTraveler / Patriot Xporter
+	1f23  PS2232 flash drive controller
    2240  microSD card reader
    3100  2/4 GB stick
    3123  Verbatim STORE N GO 4GB
+	3600  flash drive (4GB, EMTEC)
    3800  Rage XT Flash Drive
    3e00  Flash Drive
+	4100  Flash drive
+	5000  USB flash drive (32 GB SHARKOON Accelerate)
    5100  Flash Drive
 1400  Axxion Group Corp.
 1402  Bowe Bell & Howell
@@ -13944,6 +14587,8 @@
    0020  Sony Wireless SingStar
    2000  Sony Playstation Eye
 1419  ABILITY ENTERPRISE CO., LTD.
+1421  Sensor Technology
+	0605  Sentech Camera
 1429  Vega Technologies Industrial (Austria) Co.
 142a  Thales E-Transactions
    0003  Artema Hybrid
@@ -13978,6 +14623,10 @@
    5117  OpenMoko Neo1973 kernel usbnet (g_ether, CDC Ethernet) mode
    5118  OpenMoko Neo1973 Debug board (V2+)
    5119  OpenMoko Neo1973 u-boot cdc_acm serial port
+	511a  HXD8 u-boot usbtty CDC ACM Mode
+	511b  SMDK2440 u-boot usbtty CDC ACM mode
+	511c  SMDK2443 u-boot usbtty CDC ACM mode
+	511d  QT2410 u-boot usbtty CDC ACM mode
    5120  OpenMoko Neo1973 u-boot usbtty generic serial
    5121  OpenMoko Neo1973 kernel mass storage (g_storage) mode
    5122  OpenMoko Neo1973 / Neo Freerunner kernel cdc_ether USB network
@@ -14031,6 +14680,7 @@
 1487  DSP Group, Ltd.
 148e  EVATRONIX SA
 148f  Ralink Technology, Corp.
+	1000  Motorola BC4 Bluetooth 3.0+HS Adapter
    1706  RT2500USB Wireless Adapter
    2070  RT2070 Wireless Adapter
    2570  RT2570 Wireless Adapter
@@ -14047,11 +14697,19 @@
    5370  RT5370 Wireless Adapter
    5372  RT5372 Wireless Adapter
    5572  RT5572 Wireless Adapter
+	7601  MT7601U Wireless Adapter
+	760b  MT7601U Wireless Adapter
    9020  RT2500USB Wireless Adapter
    9021  RT2501USB Wireless Adapter
 1491  Futronic Technology Co. Ltd.
    0020  FS81 Fingerprint Scanner Module
 1493  Suunto
+	0010  Bluebird [Ambit]
+	0019  Duck [Ambit2]
+	001a  Colibri [Ambit2 S]
+	001b  Emu [Ambit3 Peak]
+	001c  Finch [Ambit3 Sport]
+	001d  Greentit [Ambit2 R]
 1497  Panstrong Company Ltd.
 1498  Microtek International Inc.
    a090  DVB-T Tuner
@@ -14091,12 +14749,14 @@
    0350  Storage Adapter V2
 14c8  Zytronic
 14cd  Super Top
+	1212  microSD card reader (SY-T18)
    121c  microSD card reader
+	121f  microSD CardReader SY-T18
    123a  SD/MMC/RS-MMC Card Reader
    125c  SD card reader
    127b  SDXC Reader
    6116  M6116 SATA Bridge
-	6600  USB 2.0 IDE DEVICE
+	6600  M110E PATA bridge
    6700  Card Reader
    6900  Card Reader
    8123  SD MMC Reader
@@ -14108,6 +14768,7 @@
    0501  WR-G528e 'CHEETAH'
 14e1  Dialogue Technology Corp.
    5000  PenMount 5000 Touch Controller
+14e4  Broadcom Corp.
 14e5  SAIN Information & Communications Co., Ltd.
 14ea  Planex Communications
    ab10  GW-US54GZ
@@ -14124,6 +14785,9 @@
 1500  Ellisys
 1501  Pine-Tum Enterprise Co., Ltd.
 1509  First International Computer, Inc.
+	0a01  LI-3100 Area Meter
+	0a02  LI-7000 CO2/H2O Gas Analyzer
+	0a03  C-DiGit Blot Scanner
    9242  eHome Infrared Transceiver
 1513  medMobile
    0444  medMobile
@@ -14137,6 +14801,8 @@
 1518  Cheshire Engineering Corp.
    0001  HDReye High Dynamic Range Camera
    0002  HDReye (before firmware loads)
+1519  Comneon
+	0020  HSIC Device
 1520  Bitwire Corp.
 1524  ENE Technology Inc
    6680  UTS 6680
@@ -14146,6 +14812,9 @@
 1529  UBIQUAM Co., Ltd.
    3100  CDMA 1xRTT USB Modem (U-100/105/200/300/520)
 152a  Thesycon Systemsoftware & Consulting GmbH
+	8400  INI DVS128
+	840d  INI DAViS
+	841a  INI DAViS FX3
 152d  JMicron Technology Corp. / JMicron USA Technology Corp.
    0539  JMS539 SuperSpeed SATA II 3.0G Bridge
    0770  Alienware Integrated Webcam
@@ -14165,6 +14834,7 @@
    0003  Krait Mouse
    0007  DeathAdder Mouse
    0013  Orochi mouse
+	0015  Naga Mouse
    0016  DeathAdder Mouse
    0017  RZ01-0035 Laser Gaming Mouse [Imperator]
    001c  RZ01-0036 Optical Gaming Mouse [Abyssus]
@@ -14174,7 +14844,11 @@
    0101  Copperhead Mouse
    0102  Tarantula Keyboard
    0109  Lycosa Keyboard
+	0113  RZ07-0074 Gaming Keypad [Orbweaver]
    0300  RZ06-0063 Motion Sensing Controllers [Hydra]
+153b  TerraTec Electronic GmbH
+	1181  Cinergy S2 PCIe Dual Port 1
+	1182  Cinergy S2 PCIe Dual Port 2
 1546  U-Blox AG
 1547  SG Intec Ltd & Co KG
    1000  SG-Lock[U2]
@@ -14182,8 +14856,10 @@
    8180  CARD STAR/medic2
 154b  PNY
    0010  USB 2.0 Flash Drive
+	0048  Flash Drive
    004d  8 GB Flash Drive
    0057  32GB Micro Slide Attache Flash Drive
+	007a  8GB Classic Attache Flash Drive
    6545  FD Device
 154d  ConnectCounty Holdings Berhad
 154e  D&M Holdings, Inc. (Denon/Marantz)
@@ -14229,7 +14905,8 @@
    0042  OSBDM - Debug Port
    004f  i.MX28 SystemOnChip in RecoveryMode
    0052  i.MX50 SystemOnChip in RecoveryMode
-	0054  i.MX6Q SystemOnChip in RecoveryMode
+	0054  i.MX 6Dual/6Quad SystemOnChip in RecoveryMode
+	0061  i.MX 6Solo/6DualLite SystemOnChip in RecoveryMode
 15a4  Afatech Technologies, Inc.
    1000  AF9015/AF9035 DVB-T stick
    1001  AF9015/AF9035 DVB-T stick
@@ -14266,6 +14943,7 @@
 15c2  SoundGraph Inc.
    0036  LC16M VFD Display/IR Receiver
    0038  GD01 MX LCD Display/IR Receiver
+	0042  Antec Veris Multimedia Station E-Z IR Receiver
    ffda  iMON PAD Remote Controller
    ffdc  iMON PAD Remote Controller
 15c5  Advance Multimedia Internet Technology Inc. (AMIT)
@@ -14294,6 +14972,7 @@
    0a41  MI-2540D [Optical mouse]
    0a4c  USB+PS/2 Optical Mouse
    0a4d  Optical Mouse
+	0a4f  Optical Mouse
 15dc  Hynix Semiconductor Inc.
 15e0  Seong Ji Industrial Co., Ltd.
 15e1  RSA
@@ -14555,6 +15234,9 @@
    0726  Wi-Fi Wireless LAN Adapter
    0740  802.11n Wireless LAN Card
    0901  Voyager 205 ADSL Router
+	2000  naturaSign Pad Standard
+	2001  naturaSign Pad Standard
+	fe12  Bootloader
 1696  Hitachi Video and Information System, Inc.
 1697  VTec Test, Inc.
 16a5  Shenzhen Zhengerya Cable Co., Ltd.
@@ -14609,6 +15291,7 @@
    05e4  Free shared USB VID/PID pair for MIDI devices
    06b4  USB2LPT with 2 interfaces
    06b5  USB2LPT with 3 interfaces (native, HID, printer)
+	0762  Osmocom SIMtrace
    076b  OpenPCD 13.56MHz RFID Reader
    076c  OpenPICC 13.56MHz RFID Simulator (native)
    08ac  OpenBeacon USB stick
@@ -14639,11 +15322,15 @@
    075c  AB-1.x UAC1 [Audio Widget]
    075d  AB-1.x UAC2 [Audio Widget]
    080a  S2E1 Interface
+	0870  Kaufmann Automotive GmbH, RKS+CAN Interface
+16d1  Suprema Inc.
+	0401  SUP-SFR400(A) BioMini Fingerprint Reader
 16d3  Frontline Test Equipment, Inc.
 16d5  AnyDATA Corporation
    6202  CDMA/UMTS/GPRS modem
    6501  CDMA 2000 1xRTT/EV-DO Modem
    6502  CDMA/UMTS/GPRS modem
+	6603  ADU-890WH modem
 16d6  JABLOCOM s.r.o.
    8000  GDP-04 desktop phone
    8001  EYE-02
@@ -14676,6 +15363,10 @@
 170b  Swissonic
    0011  MIDI-USB 1x1
 170d  Avnera
+1711  Leica Microsystems
+	3020  IC80 HD Camera
+1724  Meyer Instruments (MIS)
+	0115  PAXcam5
 1725  Vitesse Semiconductor
 1726  Axesstel, Inc.
    1000  wireless modem
@@ -14705,7 +15396,11 @@
    0077  WUSB54GC v3 802.11g Adapter [Ralink RT2070L]
    0078  WUSB100 v2 RangePlus Wireless Network Adapter [Ralink RT3070]
    0079  WUSB600N v2 Dual-Band Wireless-N Network Adapter [Ralink RT3572]
+173d  QSENN
+	0002  GP-K7000 keyboard
 1740  Senao
+	0100  EUB1200AC AC1200 DB Wireless Adapter [Realtek RTL8812AU]
+	0600  EUB600v1 802.11abgn Wireless Adapter [Ralink RT3572]
    0605  LevelOne WUA-0605 N_Max Wireless USB Adapter
    0615  LevelOne WUA-0615 N_Max Wireless USB Adapter
    1000  NUB-350 802.11g Wireless Adapter [Intersil ISL3887]
@@ -14719,9 +15414,12 @@
    9706  EUB9706 802.11n Wireless Adapter [Ralink RT3072]
    9801  EUB9801 802.11abgn Wireless Adapter [Ralink RT3572]
 1743  General Atomics
+1748  MQP Electronics
+	0101  Packet-Master USB12
 174c  ASMedia Technology Inc.
    5106  Transcend StoreJet 25M3
-	55aa  ASMedia 2105 SATA bridge
+	5136  ASM1053 SATA 6Gb/s bridge
+	55aa  ASM1051 SATA 3Gb/s bridge
 174f  Syntek
    1105  SM-MS/Pro-MMC-XD Card Reader
    110b  HP Webcam
@@ -14764,6 +15462,7 @@
    0c30  Telldus TellStick
    0c31  Telldus TellStick Duo
    0c9f  USBtiny
+	1eef  OpenAPC SecuKey
 1782  Spreadtrum Communications Inc.
 1784  TopSeed Technology Corp.
    0001  eHome Infrared Transceiver
@@ -14787,11 +15486,13 @@
    0002  Q1U dynamic microphone
    0100  C03U multi-pattern microphone
    0101  UB1 boundary microphone
+	0120  Meteorite condenser microphone
    0200  StudioDock monitors (internal hub)
    0201  StudioDock monitors (audio)
    0210  StudioGT monitors
    0301  Q2U handheld microphone with XLR
    0302  GoMic compact condenser microphone
+	0303  C01U Pro condenser microphone
    0304  Q2U handheld mic with XLR
    0305  GoMic compact condenser mic
    0310  Meteor condenser microphone
@@ -14842,14 +15543,17 @@
    037b  Plugable USB-VGA-165
    037c  Plugable DC-125
    037d  Plugable USB2-HDMI-165
+	410a  HDMI Adapter
    430a  HP Port Replicator (Composite Device)
    4312  S2340T
 17eb  Cornice, Inc.
 17ef  Lenovo
+	1000  Hub
    1003  Integrated Smart Card Reader
    1004  Integrated Webcam
    1008  Hub
    100a  ThinkPad Mini Dock Plus Series 3
+	304b  AX88179 Gigabit Ethernet [ThinkPad OneLink GigaLAN]
    3815  ChipsBnk 2GB USB Stick
    4802  Lenovo Vc0323+MI1310_SOC Camera
    4807  UVC Camera
@@ -14870,6 +15574,8 @@
    6007  Smartcard Keyboard
    6009  ThinkPad Keyboard with TrackPoint
    6014  Mini Wireless Keyboard N5901
+	6025  ThinkPad Travel Mouse
+	7203  Ethernet adapter [U2L 100P-Y1]
    7423  IdeaPad A1 Tablet
    7435  A789 (Mass Storage mode, with debug)
    743a  A789 (Mass Storage mode)
@@ -15513,6 +16219,9 @@
 1c22  ZHONGSHAN CHIANG YU ELECTRIC CO., LTD.
 1c26  Shanghai Haiying Electronics Co., Ltd.
 1c27  HuiYang D & S Cable Co., Ltd.
+1c29  Elster GmbH
+	0001  ExMFE5 Simulator
+	10fc  enCore device
 1c31  LS Cable Ltd.
 1c34  SpringCard
    7241  Prox'N'Roll RFID Scanner
@@ -15543,7 +16252,7 @@
 1c7a  LighTuning Technology Inc.
    0801  Fingerprint Reader
 1c7b  LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD.
-1c83  Schomäcker GmbH
+1c83  Schomaecker GmbH
    0001  RS150 V2
 1c87  2N TELEKOMUNIKACE a.s.
 1c88  Somagic, Inc.
@@ -15913,6 +16622,8 @@
    c010  Windham
 2047  Texas Instruments
    0200  MSP430 USB HID Bootstrap Loader
+	0855  Invensense Embedded MotionApp HID Sensor
+	0964  Inventio Software MSP430
 2080  Barnes & Noble
    0001  nook
    0002  NOOKcolor
@@ -16139,8 +16850,23 @@
    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 7xx GNSS/INS
+	0100  Body Pack
+	0101  Awinda Station
+	0102  Awinda Dongle
+	0103  Sync Station
+	0200  MTw
+	d00d  Wireless Receiver
 2650  Electronics For Imaging, Inc. [hex]
 2659  Sundtek
    1101  TNT DVB-T/DAB/DAB+/FM
@@ -16157,6 +16883,8 @@
    1211  MediaTV Pro III (US)
    1212  MediaTV Pro III MiniPCIe (EU)
    1213  MediaTV Pro III MiniPCIe (US)
+2676  Basler AG
+	ba02  ace
 2730  Citizen
    200f  CT-S310 Label printer
 2735  DigitalWay
@@ -16205,12 +16933,19 @@
    915d  Cyberpix S-210S / Little Tikes My Real Digital Camera
    930b  CCD Webcam(PC370R)
    930c  CCD Webcam(PC370R)
+27b8  ThingM
+	01ed  blink(1)
 2821  ASUSTek Computer Inc.
    0161  WL-161 802.11b Wireless Adapter [SiS 162U]
    160f  WL-160g 802.11g Wireless Adapter [Envara WiND512]
    3300  WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3]
 2899  Toptronic Industrial Co., Ltd
    012c  Camera Device
+2931  Jolla Oy
+	0a01  Jolla Phone MTP
+	0a02  Jolla Phone Developer
+	0a05  Jolla PC connection
+	0afe  Jolla charging only
 2c02  Planex Communications
    14ea  GW-US11H WLAN
 2c1a  Dolphin Peripherals
@@ -16218,15 +16953,24 @@
 2fb2  Fujitsu, Ltd
 3125  Eagletron
    0001  TrackerPod Camera Stand
+3136  Navini Networks
 3176  Whanam Electronics Co., Ltd
+3195  Link Instruments
+	f190  MSO-19
+	f280  MSO-28
+	f281  MSO-28
 3275  VidzMedia Pte Ltd
    4fb1  MonsterTV P2H
+3333  InLine
+	3333  2 port KVM switch model 60652K
 3334  AEI
    1701  Fast Ethernet
 3340  Yakumo
    043a  Mio A701 DigiWalker PPCPhone
    0e3a  Pocket PC 300 GPS SL / Typhoon MyGuide 3500
    a0a3  deltaX 5 BT (D) PDA
+3344  Leaguer Microelectronics (LME)
+	3744  OEM PC Remote
 3504  Micro Star
    f110  Security Key
 3538  Power Quotient International Co., Ltd
@@ -16409,9 +17153,14 @@
 4146  USBest Technology
    9281  Iomega Micro Mini 128MB Flash Drive
    ba01  Intuix Flash Drive
+4168  Targus
+	1010  Wireless Compact Laser Mouse
 4242  USB Design by Example
    4201  Buttons and Lights HID device
    4220  Echo 1 Camera
+4255  GoPro
+	1000  9FF2 [Digital Photo Display]
+	2000  HD2-14 [Hero 2 Camera]
 4317  Broadcom Corp.
    0700  U.S. Robotics USR5426 802.11g Adapter
    0701  U.S. Robotics USR5425 Wireless MAXg Adapter
@@ -16458,6 +17207,10 @@
    1001  Cetus CDC Device
 5345  Owon
    1234  PDS6062T Oscilloscope
+534c  SatoshiLabs
+	0001  Bitcoin Wallet [TREZOR]
+5354  Meyer Instruments (MIS)
+	0017  PAXcam2
 544d  Transmeta Corp.
 5543  UC-Logic Technology Corp.
    0002  SuperPen WP3325U Tablet
@@ -16508,6 +17261,7 @@
    0241  BisonCam, NB Pro
    02d0  Lenovo Integrated Webcam [R5U877]
    03d0  Lenovo Integrated Webcam [R5U877]
+59e3  Nonolith Labs
 5a57  Zinwell
    0260  RT2570
    0280  802.11a/b/g/n USB Wireless LAN Card
@@ -16524,6 +17278,35 @@
 6189  Sitecom
    182d  USB 2.0 Ethernet
    2068  USB to serial cable (v2)
+6244  LightingSoft AG
+	0101  Intelligent Usb Dmx Interface SIUDI5A
+	0201  Intelligent Usb Dmx Interface SIUDI5C
+	0300  Intelligent Usb Dmx Interface SIUDI6 Firmware download
+	0301  Intelligent Usb Dmx Interface SIUDI6C
+	0302  Intelligent Usb Dmx Interface SIUDI6A
+	0303  Intelligent Usb Dmx Interface SIUDI6D
+	0400  Touch Sensitive Intelligent Control Keypad STICK1A
+	0401  Touch Sensitive Intelligent Control Keypad STICK1A
+	0410  Intelligent Usb Dmx Interface SIUDI7 Firmware Download
+	0411  Intelligent Usb Dmx Interface SIUDI7A
+	0420  Intelligent Usb Dmx Interface SIUDI8A Firmware Download
+	0421  Intelligent Usb Dmx Interface SIUDI8A
+	0430  Intelligent Usb Dmx Interface SIUDI8C Firmware Download
+	0431  Intelligent Usb Dmx Interface SIUDI8C
+	0440  Intelligent Usb Dmx Interface SIUDI9A Firmware Download
+	0441  Intelligent Usb Dmx Interface SIUDI9A
+	0450  Intelligent Usb Dmx Interface SIUDI9C Firmware Download
+	0451  Intelligent Usb Dmx Interface SIUDI9C
+	0460  Touch Sensitive Intelligent Control Keypad STICK2 Firmware download
+	0461  Touch Sensitive Intelligent Control Keypad STICK2
+	0470  Touch Sensitive Intelligent Control Keypad STICK1B Firmware download
+	0471  Touch Sensitive Intelligent Control Keypad STICK1B
+	0480  Touch Sensitive Intelligent Control Keypad STICK3 Firmware download
+	0481  Touch Sensitive Intelligent Control Keypad STICK3
+	0490  Intelligent Usb Dmx Interface SIUDI9D Firmware Download
+	0491  Intelligent Usb Dmx Interface SIUDI9D
+	0500  Touch Sensitive Intelligent Control Keypad STICK2B Firmware download
+	0501  Touch Sensitive Intelligent Control Keypad STICK2B
 6253  TwinHan Technology Co., Ltd
    0100  Ir reciver f. remote control
 636c  CoreLogic, Inc.
@@ -16615,6 +17398,15 @@
    3301  Retro Adapter Mouse
 8341  EGO Systems, Inc.
    2000  Flashdisk
+8564  Transcend Information, Inc.
+	1000  JetFlash
+		8564 1000  JetFlash
+	4000  RDF8
+8644  Intenso GmbG
+	8003  Micro Line
+	800b  Micro Line (4GB)
+8e06  CH Products, Inc.
+	f700  DT225 Trackball
 9016  Sitecom
    182d  WL-022 802.11b Adapter
 9022  TeVii Technology Ltd.
@@ -16635,6 +17427,10 @@
    7830  MCS7830 10/100 Mbps Ethernet adapter
    7832  MCS7832 10/100 Mbps Ethernet adapter
    7840  MCS7820/MCS7840 2/4 port serial adapter
+9849  Bestmedia CD Recordable GmbH & Co. KG
+	0701  Platinum MyDrive HP
+9999  Odeon
+	0001  JAF Mobile Phone Flasher Interface
 99fa  Grandtec
    8988  V.cap Camera Device
 9ac4  J. Westhues
@@ -16663,16 +17459,27 @@ a727  3Com
    6893  3CRUSB20075 OfficeConnect Wireless 108Mbps 11g Adapter [Atheros AR5523]
    6895  AR5523
    6897  AR5523
+aaaa  MXT
+	8815  microSD CardReader
 abcd  Unknown
    cdee  Petcam
+b58e  Blue Microphones
+	9e84  Yeti Stereo Microphone
+c216  Card Device Expert Co., LTD
+	0180  MSR90 MagStripe reader
 c251  Keil Software, Inc.
    2710  ULink
 cace  CACE Technologies Inc.
    0002  AirPCAP Classic 802.11 packet capture adapter
    0300  AirPcap NX [Atheros AR9001U-(2)NG]
+cd12  SMART TECHNOLOGY INDUSTRIAL LTD.
+d208  Ultimarc
+	0310  Mini-PAC Arcade Control Interface
 d209  Ultimarc
    0301  I-PAC Arcade Control Interface
    0501  Ultra-Stik Ultimarc Ultra-Stik Player 1
+d904  LogiLink
+	0003  Laser Mouse (ID0009A)
 e4e4  Xorcom Ltd.
    1130  Astribank series
    1131  Astribank series
@@ -16705,10 +17512,22 @@ eb1a  eMPIA Technology, Inc.
    50a6  Gadmei UTV330 TV Box
    e355  KWorld DVB-T 355U Digital TV Dongle
 eb2a  KWorld
+ef18  SMART TECHNOLOGY INDUSTRIAL LTD.
 f003  Hewlett Packard
    6002  PhotoSmart C500
+f182  Leap Motion
+	0003  Controller
 f4ec  Atten Electronics / Siglent Technologies
    ee38  Digital Storage Oscilloscope
+f4ed  Shenzhen Siglent Co., Ltd.
+	ee37  SDG1010 Waveform Generator
+	ee3a  SDG1010 Waveform Generator (TMC mode)
+f766  Hama
+	0001  PC-Gamepad "Greystorm"
+fc08  Conrad Electronic SE
+	0101  MIDI Cable UA0037
+ffee  FNK Tech
+	0100  Card Reader Controller RTS5101/RTS5111/RTS5116
# List of known device classes, subclasses and protocols
@@ -16831,6 +17650,7 @@ C ef  Miscellaneous Device
    	02  Wire Adapter Multifunction Peripheral
    03  ?
    	01  Cable Based Association
+	05  USB3 Vision
 C fe  Application Specific Interface
    01  Device Firmware Update
    02  IRDA Bridge
diff --git a/src/patches/fireinfo/0001-bogomips-Don-t-crash-when-no-bogomips-are-available.patch b/src/patches/fireinfo/0001-bogomips-Don-t-crash-when-no-bogomips-are-available.patch
deleted file mode 100644
index c1f8a77..0000000
--- a/src/patches/fireinfo/0001-bogomips-Don-t-crash-when-no-bogomips-are-available.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From a9401d9542fae575d9ce2bb534cd4e598e9c7b8e Mon Sep 17 00:00:00 2001
-From: Michael Tremer michael.tremer@ipfire.org
-Date: Tue, 28 Oct 2014 21:14:41 +0100
-Subject: [PATCH 1/3] bogomips: Don't crash when no bogomips are available
-
-The RPi doesn't provide bogomips in /proc/cpuinfo any more
-and fireinfo crashed when trying to read that file
----
- src/fireinfo/cpu.py    | 14 +++++++++-----
- src/fireinfo/system.py |  4 +++-
- 2 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/src/fireinfo/cpu.py b/src/fireinfo/cpu.py
-index 32d885db8124..541575af6bbb 100644
---- a/src/fireinfo/cpu.py
-+++ b/src/fireinfo/cpu.py
-@@ -80,12 +80,16 @@ class CPU(object):
- 		"""
- 			Return the bogomips of this CPU.
- 		"""
--		try:
--			bogomips = self.__cpuinfo["bogomips"]
--		except KeyError:
--			bogomips = self.__cpuinfo["BogoMIPS"]
-+		bogomips = None
-+
-+		for key in ("bogomips", "BogoMIPS"):
-+			try:
-+				bogomips = self.__cpuinfo[key]
-+			except KeyError:
-+				continue
- 
--		return float(bogomips)
-+		if bogomips:
-+			return float(bogomips)
- 
- 	@property
- 	def model(self):
-diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
-index 8e903e8e3449..890f58c05027 100644
---- a/src/fireinfo/system.py
-+++ b/src/fireinfo/system.py
-@@ -144,12 +144,14 @@ class System(object):
- 			"model_string" : self.cpu.model_string,
- 			"stepping" : self.cpu.stepping,
- 			"flags" : self.cpu.flags,
--			"bogomips" : self.cpu.bogomips,
- 			"speed" : self.cpu.speed,
- 			"family" : self.cpu.family,
- 			"count" : self.cpu.count				
- 		}
- 
-+		if self.cpu.bogomips:
-+			p["bogomips"] = self.cpu.bogomips
-+
- 		p["network"] = {
- 			"green" : self.network.has_green(),
- 			"blue" : self.network.has_blue(),
--- 
-1.9.3
-
diff --git a/src/patches/fireinfo/0002-ARM-Read-board-model-from-device-tree-in-proc.patch b/src/patches/fireinfo/0002-ARM-Read-board-model-from-device-tree-in-proc.patch
deleted file mode 100644
index 5ea1e44..0000000
--- a/src/patches/fireinfo/0002-ARM-Read-board-model-from-device-tree-in-proc.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From b9a068e26261007d4a0592fcb47f82658af2c775 Mon Sep 17 00:00:00 2001
-From: Michael Tremer michael.tremer@ipfire.org
-Date: Mon, 3 Nov 2014 21:33:45 +0100
-Subject: [PATCH 2/3] ARM: Read board model from device-tree in /proc
-
----
- src/fireinfo/system.py | 35 +++++++++--------------------------
- 1 file changed, 9 insertions(+), 26 deletions(-)
-
-diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
-index 890f58c05027..195832e9f7eb 100644
---- a/src/fireinfo/system.py
-+++ b/src/fireinfo/system.py
-@@ -304,27 +304,6 @@ class System(object):
- 		"""
- 		return read_from_file("/sys/class/dmi/id/bios_vendor")
- 
--	def vendor_model_tuple(self):
--		try:
--			s = self.__cpuinfo["Hardware"]
--		except KeyError:
--			return (None, None)
--
--		if s.startswith("ARM-Versatile"):
--			return ("ARM", s)
--
--		try:
--			v, m = s.split(" ", 1)
--		except ValueError:
--			if s.startswith("BCM"):
--				v = "Broadcom"
--				m = s
--			else:
--				v = None
--				m = s
--
--		return v, m
--
- 	@property
- 	def vendor(self):
- 		"""
-@@ -337,8 +316,10 @@ class System(object):
- 				break
- 
- 		if ret is None:
--			v, m = self.vendor_model_tuple()
--			ret = v
-+			try:
-+				return self.__cpuinfo["Hardware"]
-+			except KeyError:
-+				pass
- 
- 		return ret
- 
-@@ -353,9 +334,11 @@ class System(object):
- 			if ret:
- 				break
- 
--		if ret is None:
--			v, m = self.vendor_model_tuple()
--			ret = m
-+		# Read device-tree model if available
-+		ret = read_from_file("/proc/device-tree/model")
-+		if ret:
-+			# replace the NULL byte with which the DT string ends
-+			ret = ret.replace(u"\u0000", "")
- 
- 		return ret
- 
--- 
-1.9.3
-
diff --git a/src/patches/fireinfo/0003-Revert-vendor-model-for-ARM-to-old-behaviour.patch b/src/patches/fireinfo/0003-Revert-vendor-model-for-ARM-to-old-behaviour.patch
deleted file mode 100644
index 66fbfe1..0000000
--- a/src/patches/fireinfo/0003-Revert-vendor-model-for-ARM-to-old-behaviour.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 810fe43289f5b003cbf80ebb1d9a79f52a767cdb Mon Sep 17 00:00:00 2001
-From: Michael Tremer michael.tremer@ipfire.org
-Date: Mon, 15 Dec 2014 22:48:26 +0100
-Subject: [PATCH 3/3] Revert vendor/model for ARM to old behaviour
-
----
- src/fireinfo/system.py | 33 +++++++++++++++++++++++++++++----
- 1 file changed, 29 insertions(+), 4 deletions(-)
-
-diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
-index 195832e9f7eb..ce33837af747 100644
---- a/src/fireinfo/system.py
-+++ b/src/fireinfo/system.py
-@@ -304,6 +304,27 @@ class System(object):
- 		"""
- 		return read_from_file("/sys/class/dmi/id/bios_vendor")
- 
-+	def vendor_model_tuple(self):
-+		try:
-+			s = self.__cpuinfo["Hardware"]
-+		except KeyError:
-+			return (None, None)
-+
-+		if s.startswith("ARM-Versatile"):
-+			return ("ARM", s)
-+
-+		try:
-+			v, m = s.split(" ", 1)
-+		except ValueError:
-+			if s.startswith("BCM"):
-+				v = "Broadcom"
-+				m = s
-+			else:
-+				v = None
-+				m = s
-+
-+		return v, m
-+
- 	@property
- 	def vendor(self):
- 		"""
-@@ -316,10 +337,10 @@ class System(object):
- 				break
- 
- 		if ret is None:
--			try:
--				return self.__cpuinfo["Hardware"]
--			except KeyError:
--				pass
-+			if os.path.exists("/proc/device-tree"):
-+				ret = self.__cpuinfo.get("Hardware", None)
-+			else:
-+				ret, m = self.vendor_model_tuple()
- 
- 		return ret
- 
-@@ -340,6 +361,10 @@ class System(object):
- 			# replace the NULL byte with which the DT string ends
- 			ret = ret.replace(u"\u0000", "")
- 
-+		# Fall back to read /proc/cpuinfo
-+		if not ret:
-+			v, ret = self.vendor_model_tuple()
-+
- 		return ret
- 
- 	@property
--- 
-1.9.3
-
diff --git a/src/patches/strongswan-5.2.2-issue-816.patch b/src/patches/strongswan-5.2.2-issue-816.patch
new file mode 100644
index 0000000..d9dfc8a
--- /dev/null
+++ b/src/patches/strongswan-5.2.2-issue-816.patch
@@ -0,0 +1,13 @@
+diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/t
+index e9a677a655e4..69118abe78df 100644
+--- a/src/libcharon/sa/ikev2/task_manager_v2.c
++++ b/src/libcharon/sa/ikev2/task_manager_v2.c
+@@ -1339,7 +1339,7 @@ METHOD(task_manager_t, process_message, status_t,
+        {
+            DBG1(DBG_IKE, "received message ID %d, expected %d. Ignored",
+                 mid, this->responding.mid);
+-           if (msg->get_exchange_type(msg) == IKE_SA_INIT)
++           if (mid != 0 && msg->get_exchange_type(msg) == IKE_SA_INIT)
+            {   /* clean up IKE_SA state if IKE_SA_INIT has invalid msg ID */
+                return DESTROY_ME;
+            }
diff --git a/src/patches/strongswan-5.2.2-issue-819-cd2c30a.patch b/src/patches/strongswan-5.2.2-issue-819-cd2c30a.patch
new file mode 100644
index 0000000..0c54812
--- /dev/null
+++ b/src/patches/strongswan-5.2.2-issue-819-cd2c30a.patch
@@ -0,0 +1,50 @@
+From cd2c30a56ec9bdab8b3923851509f27a4fd6f537 Mon Sep 17 00:00:00 2001
+From: Tobias Brunner tobias@strongswan.org
+Date: Tue, 10 Feb 2015 19:03:44 +0100
+Subject: [PATCH] ikev1: Set protocol ID and SPIs in INITIAL-CONTACT
+ notification payloads
+
+The payload we sent before is not compliant with RFC 2407 and thus some
+peers might abort negotiation (e.g. with an INVALID-PROTOCOL-ID error).
+
+ #819
+---
+ src/libcharon/sa/ikev1/tasks/main_mode.c |   15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c
+index 5065e70..3ea4a2a 100644
+--- a/src/libcharon/sa/ikev1/tasks/main_mode.c
++++ b/src/libcharon/sa/ikev1/tasks/main_mode.c
+@@ -213,6 +213,10 @@ static void add_initial_contact(private_main_mode_t *this, message_t *message,
+ {
+ 	identification_t *idr;
+ 	host_t *host;
++	notify_payload_t *notify;
++	ike_sa_id_t *ike_sa_id;
++	u_int64_t spi_i, spi_r;
++	chunk_t spi;
+ 
+ 	idr = this->ph1->get_id(this->ph1, this->peer_cfg, FALSE);
+ 	if (idr && !idr->contains_wildcards(idr))
+@@ -224,8 +228,15 @@ static void add_initial_contact(private_main_mode_t *this, message_t *message,
+ 			if (!charon->ike_sa_manager->has_contact(charon->ike_sa_manager,
+ 										idi, idr, host->get_family(host)))
+ 			{
+-				message->add_notify(message, FALSE, INITIAL_CONTACT_IKEV1,
+-									chunk_empty);
++				notify = notify_payload_create_from_protocol_and_type(
++								PLV1_NOTIFY, PROTO_IKE, INITIAL_CONTACT_IKEV1);
++				ike_sa_id = this->ike_sa->get_id(this->ike_sa);
++				spi_i = ike_sa_id->get_initiator_spi(ike_sa_id);
++				spi_r = ike_sa_id->get_responder_spi(ike_sa_id);
++				spi = chunk_cata("cc", chunk_from_thing(spi_i),
++								 chunk_from_thing(spi_r));
++				notify->set_spi_data(notify, spi);
++				message->add_payload(message, (payload_t*)notify);
+ 			}
+ 		}
+ 	}
+-- 
+1.7.9.5
+
hooks/post-receive
--
IPFire 2.x development tree

    