Merge remote-tracking branch 'origin/next' into thirteen

Conflicts:
	lfs/php
	make.sh

diff --git a/config/cfgroot/ethernet-vlans b/config/cfgroot/ethernet-vlans
new file mode 100644 (file)
index 0000000..08cb36a
--- /dev/null
+++ b/config/cfgroot/ethernet-vlans
@@ -0,0 +1,9 @@
+#GREEN_PARENT_DEV="eth0"
+#GREEN_VLAN_ID=20
+#GREEN_MAC_ADDRESS="00:11:22:33:44:55"
+#BLUE_PARENT_DEV="green0"
+#BLUE_VLAN_ID=30
+#BLUE_MAC_ADDRESS="00:22:33:44:55:66"
+#ORANGE_PARENT_DEV="green0"
+#ORANGE_VLAN_ID=40
+#ORANGE_MAC_ADDRESS="00:33:44:55:66:77"

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 1d7dd93aa00b04abe9a27f92c8da065abb6c55f6..8bb49e0bd3fd2d9d789d729a68b78aaeda5b4ff5 100644 (file)
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -73,7 +73,6 @@ my $PROTO = "";
 my $DPORT = "";
 my $DEV = "";
 my $MAC = "";
-my $POLICY = "";
 my $DO = "";
 my $DAY = "";
 
@@ -90,11 +89,9 @@ close FILE;
 
 if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
        $outfwsettings{'STATE'} = "ALLOW";
-       $POLICY = "DROP";
-       $DO = "ACCEPT";
+       $DO = "RETURN";
 } elsif ( $outfwsettings{'POLICY'} eq 'MODE2' ) {
        $outfwsettings{'STATE'} = "DENY";
-       $POLICY = "ACCEPT";
        $DO = "DROP -m comment --comment 'DROP_OUTGOINGFW '";
 }
 
@@ -112,13 +109,13 @@ if ( $outfwsettings{'POLICY'} eq 'MODE0' ) {
 }
 
 if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
-       $CMD = "/sbin/iptables -A OUTGOINGFW -m state --state ESTABLISHED,RELATED -j ACCEPT";
+       $CMD = "/sbin/iptables -A OUTGOINGFW -m state --state ESTABLISHED,RELATED -j RETURN";
        if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); }
-       $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m state --state ESTABLISHED,RELATED -j ACCEPT";
+       $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m state --state ESTABLISHED,RELATED -j RETURN";
        if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); }
-               $CMD = "/sbin/iptables -A OUTGOINGFW -p icmp -j ACCEPT";
+               $CMD = "/sbin/iptables -A OUTGOINGFW -p icmp -j RETURN";
        if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); }
-               $CMD = "/sbin/iptables -A OUTGOINGFWMAC -p icmp -j ACCEPT";
+               $CMD = "/sbin/iptables -A OUTGOINGFWMAC -p icmp -j RETURN";
        if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); }
 }
 
@@ -260,7 +257,7 @@ foreach $p2pentry (sort @p2ps)
                        $P2PSTRING = "$P2PSTRING --$p2pline[1]";
                }
        } else {
-               $DO = "ACCEPT";
+               $DO = "RETURN";
                if ("$p2pline[2]" eq "on") {
                        $P2PSTRING = "$P2PSTRING --$p2pline[1]";
                }
@@ -290,4 +287,4 @@ if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
        } else {
                system("$CMD");
        }
-}
\ No newline at end of file
+}

diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index eaa6352d74c6b5a41bb54b892e10d6d7ba9e5381..ccb7bfb33892b6452fc92150cc1870f08e8d8d61 100644 (file)
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -47,6 +47,7 @@ etc/rc.d/init.d/mISDN
 #etc/rc.d/init.d/mediatomb
 #etc/rc.d/init.d/messagebus
 #etc/rc.d/init.d/miau
+#etc/rc.d/init.d/minidlna
 #etc/rc.d/init.d/miniupnpd
 #etc/rc.d/init.d/mldonkey
 etc/rc.d/init.d/modules
@@ -57,6 +58,7 @@ etc/rc.d/init.d/mountkernfs
 #etc/rc.d/init.d/mysql
 #etc/rc.d/init.d/netsnmpd
 etc/rc.d/init.d/network
+etc/rc.d/init.d/network-vlans
 #etc/rc.d/init.d/networking
 etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/blue
@@ -212,6 +214,7 @@ etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S75firstsetup
 etc/rc.d/rcsysinit.d/S80localnet
 etc/rc.d/rcsysinit.d/S90sysctl
+etc/rc.d/rcsysinit.d/S91network-vlans
 etc/rc.d/rc3.d/S15fireinfo
 #etc/sysconfig
 etc/sysconfig/createfiles

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 8fdd7ac96a4c5dbb86aaa3c390f5ec1429c7f7d6..e14f7e0e23b2ea68bd3ef9e7d35c8d49f63fb793 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -35,6 +35,7 @@ var/ipfire/ethernet
 #var/ipfire/ethernet/known_nics
 #var/ipfire/ethernet/scanned_nics
 #var/ipfire/ethernet/settings
+#var/ipfire/ethernet/vlans
 #var/ipfire/extrahd
 #var/ipfire/extrahd/bin
 var/ipfire/extrahd/bin/extrahd.pl
@@ -57,9 +58,9 @@ var/ipfire/langs
 #var/ipfire/langs/en.pl
 #var/ipfire/langs/es.pl
 #var/ipfire/langs/fr.pl
+#var/ipfire/langs/list
 #var/ipfire/langs/pl.pl
 #var/ipfire/langs/ru.pl
-#var/ipfire/langs/list
 var/ipfire/logging
 #var/ipfire/logging/settings
 var/ipfire/mac

diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 882628afd82fc2bdaf6acccb3293debe91e3c461..653060f72237f611564af15cb6ab931c45189556 100644 (file)
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -48,6 +48,7 @@ etc/rc.d/init.d/mISDN
 #etc/rc.d/init.d/mediatomb
 #etc/rc.d/init.d/messagebus
 #etc/rc.d/init.d/miau
+#etc/rc.d/init.d/minidlna
 #etc/rc.d/init.d/miniupnpd
 #etc/rc.d/init.d/mldonkey
 etc/rc.d/init.d/modules
@@ -58,6 +59,7 @@ etc/rc.d/init.d/mountkernfs
 #etc/rc.d/init.d/mysql
 #etc/rc.d/init.d/netsnmpd
 etc/rc.d/init.d/network
+etc/rc.d/init.d/network-vlans
 #etc/rc.d/init.d/networking
 etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/blue
@@ -215,6 +217,7 @@ etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S75firstsetup
 etc/rc.d/rcsysinit.d/S80localnet
 etc/rc.d/rcsysinit.d/S90sysctl
+etc/rc.d/rcsysinit.d/S91network-vlans
 etc/rc.d/rc3.d/S15fireinfo
 #etc/sysconfig
 etc/sysconfig/createfiles

diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data
index 3d6af6db2c344879ce41b599812cb0328ef89d2d..448a19ea8f8537651a75de74afc948e1f5301c0a 100644 (file)
--- a/config/rootfiles/common/usb_modeswitch_data
+++ b/config/rootfiles/common/usb_modeswitch_data
@@ -5,6 +5,7 @@ usr/share/usb_modeswitch/03f0:002a
 usr/share/usb_modeswitch/0408:f000
 usr/share/usb_modeswitch/0421:060c
 usr/share/usb_modeswitch/0421:0610
+usr/share/usb_modeswitch/0421:061d
 usr/share/usb_modeswitch/0421:0622
 usr/share/usb_modeswitch/0421:0627
 usr/share/usb_modeswitch/0421:062c
@@ -35,6 +36,7 @@ usr/share/usb_modeswitch/05c7:1000
 usr/share/usb_modeswitch/072f:100d
 usr/share/usb_modeswitch/07d1:a800
 usr/share/usb_modeswitch/07d1:a804
+usr/share/usb_modeswitch/0922:1001
 usr/share/usb_modeswitch/0930:0d46
 usr/share/usb_modeswitch/0ace:2011
 usr/share/usb_modeswitch/0ace:20ff
@@ -77,6 +79,7 @@ usr/share/usb_modeswitch/0af0:8302
 usr/share/usb_modeswitch/0af0:8304
 usr/share/usb_modeswitch/0af0:8400
 usr/share/usb_modeswitch/0af0:8600
+usr/share/usb_modeswitch/0af0:8700
 usr/share/usb_modeswitch/0af0:8800
 usr/share/usb_modeswitch/0af0:8900
 usr/share/usb_modeswitch/0af0:9000
@@ -163,6 +166,7 @@ usr/share/usb_modeswitch/1410:5041
 usr/share/usb_modeswitch/1410:5059
 usr/share/usb_modeswitch/148e:a000
 usr/share/usb_modeswitch/148f:2578
+usr/share/usb_modeswitch/15eb:7153
 usr/share/usb_modeswitch/16d8:6281
 usr/share/usb_modeswitch/16d8:6803
 usr/share/usb_modeswitch/16d8:6804
@@ -184,12 +188,15 @@ usr/share/usb_modeswitch/19d2:0110
 usr/share/usb_modeswitch/19d2:0115
 usr/share/usb_modeswitch/19d2:0146
 usr/share/usb_modeswitch/19d2:0149
+usr/share/usb_modeswitch/19d2:0154
 usr/share/usb_modeswitch/19d2:0166
 usr/share/usb_modeswitch/19d2:0169
+usr/share/usb_modeswitch/19d2:0325
 usr/share/usb_modeswitch/19d2:1001
 usr/share/usb_modeswitch/19d2:1007
 usr/share/usb_modeswitch/19d2:1009
 usr/share/usb_modeswitch/19d2:1013
+usr/share/usb_modeswitch/19d2:1017
 usr/share/usb_modeswitch/19d2:1171
 usr/share/usb_modeswitch/19d2:1175
 usr/share/usb_modeswitch/19d2:1179
@@ -209,7 +216,9 @@ usr/share/usb_modeswitch/1a8d:1000
 usr/share/usb_modeswitch/1a8d:2000
 usr/share/usb_modeswitch/1ab7:5700
 usr/share/usb_modeswitch/1b7d:0700
+usr/share/usb_modeswitch/1bbb:00ca
 usr/share/usb_modeswitch/1bbb:f000
+usr/share/usb_modeswitch/1bbb:f017
 usr/share/usb_modeswitch/1bbb:f052
 usr/share/usb_modeswitch/1c9e:1001
 usr/share/usb_modeswitch/1c9e:6061
@@ -227,6 +236,7 @@ usr/share/usb_modeswitch/1edf:6003
 usr/share/usb_modeswitch/1ee8:0009
 usr/share/usb_modeswitch/1ee8:0013
 usr/share/usb_modeswitch/1ee8:0040
+usr/share/usb_modeswitch/1ee8:004a
 usr/share/usb_modeswitch/1ee8:0060
 usr/share/usb_modeswitch/1f28:0021
 usr/share/usb_modeswitch/1fac:0032
@@ -237,7 +247,10 @@ usr/share/usb_modeswitch/201e:2009
 usr/share/usb_modeswitch/2020:f00e
 usr/share/usb_modeswitch/2077:f000
 usr/share/usb_modeswitch/21f5:1000
+usr/share/usb_modeswitch/22de:6803
 usr/share/usb_modeswitch/22f4:0021
 usr/share/usb_modeswitch/230d:0001
 usr/share/usb_modeswitch/230d:0007
+usr/share/usb_modeswitch/230d:0101
+usr/share/usb_modeswitch/2357:0200
 usr/share/usb_modeswitch/8888:6500

diff --git a/config/rootfiles/core/62/filelists/GeoIP b/config/rootfiles/core/62/filelists/GeoIP
new file mode 100644 (file)
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/core/62/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat

diff --git a/config/rootfiles/core/62/filelists/files b/config/rootfiles/core/62/filelists/files
index 89987a1b6e0e2b4fee96de2ba887013893938295..34f0d1620a691926b7e0b00a62d81130006cef25 100644 (file)
--- a/config/rootfiles/core/62/filelists/files
+++ b/config/rootfiles/core/62/filelists/files
@@ -1,4 +1,8 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/network-vlans
+etc/rc.d/rcsysinit.d/S91network-vlans
 srv/web/ipfire/cgi-bin/connections.cgi
 usr/lib/gconv
+var/ipfire/ethernet/vlans
+var/ipfire/outgoing/bin/outgoingfw.pl

diff --git a/config/rootfiles/core/62/filelists/hwdata b/config/rootfiles/core/62/filelists/hwdata
new file mode 100644 (file)
index 0000000..5a9672f
--- /dev/null
+++ b/config/rootfiles/core/62/filelists/hwdata
@@ -0,0 +1,2 @@
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids

diff --git a/config/rootfiles/core/62/filelists/php b/config/rootfiles/core/62/filelists/php
new file mode 120000 (symlink)
index 0000000..1ae48d7
--- /dev/null
+++ b/config/rootfiles/core/62/filelists/php
@@ -0,0 +1 @@
+../../../common/php
\ No newline at end of file

diff --git a/config/rootfiles/core/62/filelists/usb_modeswitch b/config/rootfiles/core/62/filelists/usb_modeswitch
new file mode 120000 (symlink)
index 0000000..acbab6f
--- /dev/null
+++ b/config/rootfiles/core/62/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file

diff --git a/config/rootfiles/core/62/filelists/usb_modeswitch_data b/config/rootfiles/core/62/filelists/usb_modeswitch_data
new file mode 120000 (symlink)
index 0000000..4cbce46
--- /dev/null
+++ b/config/rootfiles/core/62/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file

diff --git a/config/rootfiles/packages/apcupsd b/config/rootfiles/packages/apcupsd
index 7a5df79b3e2d082836a7ff992c1ec0a5f2187626..b58ed2b47899ff65d1c24129f44d1b7bfb11d5c0 100644 (file)
--- a/config/rootfiles/packages/apcupsd
+++ b/config/rootfiles/packages/apcupsd
@@ -12,11 +12,12 @@ etc/apcupsd/onbattery
 etc/rc.d/rc0.d/K35apcupsd
 etc/rc.d/rc3.d/S65apcupsd
 etc/rc.d/rc6.d/K35apcupsd
+#root/.lesshst
 sbin/apcaccess
 sbin/apctest
 sbin/apcupsd
 sbin/smtp
-#srv/web/ipfire/cgi-bin/multimon.cgi
+srv/web/ipfire/cgi-bin/multimon.cgi
 srv/web/ipfire/cgi-bin/upsfstats.cgi
 srv/web/ipfire/cgi-bin/upsimage.cgi
 srv/web/ipfire/cgi-bin/upsstats.cgi
@@ -25,6 +26,10 @@ srv/web/ipfire/cgi-bin/upsstats.cgi
 #usr/share/hal/fdi/policy
 #usr/share/hal/fdi/policy/20thirdparty
 #usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi
+#usr/share/man/man5/apcupsd.conf.5
+#usr/share/man/man8/apcaccess.8
+#usr/share/man/man8/apccontrol.8
+#usr/share/man/man8/apctest.8
 #usr/share/man/man8/apcupsd.8
 etc/rc.d/init.d/apcupsd
 var/ipfire/menu.d/EX-apcupsd.menu

diff --git a/config/rootfiles/packages/fping b/config/rootfiles/packages/fping
new file mode 100644 (file)
index 0000000..ccc16e9
--- /dev/null
+++ b/config/rootfiles/packages/fping
@@ -0,0 +1,2 @@
+usr/sbin/fping
+#usr/share/man/man8/fping.8

diff --git a/config/rootfiles/packages/minidlna b/config/rootfiles/packages/minidlna
index e53330e9232d8485bba69dfee86d166f0ce480bc..c30e30b406cd31fbdd5260b4b901ccf69f6b413c 100644 (file)
--- a/config/rootfiles/packages/minidlna
+++ b/config/rootfiles/packages/minidlna
@@ -1,2 +1,3 @@
+etc/rc.d/init.d/minidlna
 etc/minidlna.conf
 usr/sbin/minidlna

diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap
index ab15654a82e612446e3af8646c9235d11f5f56a9..8f39897fdf7646ec1707a58e05d4185013e1fdb7 100644 (file)
--- a/config/rootfiles/packages/nmap
+++ b/config/rootfiles/packages/nmap
@@ -55,16 +55,25 @@ usr/share/nmap/nmap.xsl
 usr/share/nmap/nse_main.lua
 #usr/share/nmap/nselib
 usr/share/nmap/nselib/afp.lua
+usr/share/nmap/nselib/amqp.lua
 usr/share/nmap/nselib/asn1.lua
 usr/share/nmap/nselib/base64.lua
+usr/share/nmap/nselib/bitcoin.lua
+usr/share/nmap/nselib/bittorrent.lua
 usr/share/nmap/nselib/brute.lua
 usr/share/nmap/nselib/citrixxml.lua
 usr/share/nmap/nselib/comm.lua
+usr/share/nmap/nselib/creds.lua
+usr/share/nmap/nselib/cvs.lua
 #usr/share/nmap/nselib/data
 usr/share/nmap/nselib/data/favicon-db
+usr/share/nmap/nselib/data/http-default-accounts-fingerprints.lua
 usr/share/nmap/nselib/data/http-fingerprints.lua
 usr/share/nmap/nselib/data/http-folders.txt
+usr/share/nmap/nselib/data/mysql-cis.audit
+usr/share/nmap/nselib/data/oracle-default-accounts.lst
 usr/share/nmap/nselib/data/oracle-sids
+usr/share/nmap/nselib/data/packetdecoders.lua
 usr/share/nmap/nselib/data/passwords.lst
 #usr/share/nmap/nselib/data/psexec
 usr/share/nmap/nselib/data/psexec/README
@@ -77,15 +86,26 @@ usr/share/nmap/nselib/data/psexec/network.lua
 usr/share/nmap/nselib/data/psexec/nmap_service.c
 usr/share/nmap/nselib/data/psexec/nmap_service.vcproj
 usr/share/nmap/nselib/data/psexec/pwdump.lua
+usr/share/nmap/nselib/data/rtsp-urls.txt
+usr/share/nmap/nselib/data/snmpcommunities.lst
+usr/share/nmap/nselib/data/ssl-ciphers
+usr/share/nmap/nselib/data/ssl-fingerprints
+usr/share/nmap/nselib/data/tftplist.txt
 usr/share/nmap/nselib/data/usernames.lst
+usr/share/nmap/nselib/data/wp-plugins.lst
 usr/share/nmap/nselib/datafiles.lua
 usr/share/nmap/nselib/dhcp.lua
+usr/share/nmap/nselib/dhcp6.lua
 usr/share/nmap/nselib/dns.lua
+usr/share/nmap/nselib/dnsbl.lua
 usr/share/nmap/nselib/dnssd.lua
 usr/share/nmap/nselib/drda.lua
+usr/share/nmap/nselib/eap.lua
 usr/share/nmap/nselib/ftp.lua
 usr/share/nmap/nselib/giop.lua
 usr/share/nmap/nselib/http.lua
+usr/share/nmap/nselib/httpspider.lua
+usr/share/nmap/nselib/iax2.lua
 usr/share/nmap/nselib/imap.lua
 usr/share/nmap/nselib/informix.lua
 usr/share/nmap/nselib/ipOps.lua
@@ -94,52 +114,105 @@ usr/share/nmap/nselib/json.lua
 usr/share/nmap/nselib/ldap.lua
 usr/share/nmap/nselib/listop.lua
 usr/share/nmap/nselib/match.lua
+usr/share/nmap/nselib/membase.lua
 usr/share/nmap/nselib/mongodb.lua
 usr/share/nmap/nselib/msrpc.lua
 usr/share/nmap/nselib/msrpcperformance.lua
 usr/share/nmap/nselib/msrpctypes.lua
 usr/share/nmap/nselib/mssql.lua
 usr/share/nmap/nselib/mysql.lua
+usr/share/nmap/nselib/natpmp.lua
+usr/share/nmap/nselib/ncp.lua
+usr/share/nmap/nselib/ndmp.lua
 usr/share/nmap/nselib/netbios.lua
 usr/share/nmap/nselib/nrpc.lua
 usr/share/nmap/nselib/nsedebug.lua
+usr/share/nmap/nselib/omp2.lua
 usr/share/nmap/nselib/packet.lua
 usr/share/nmap/nselib/pgsql.lua
 usr/share/nmap/nselib/pop3.lua
+usr/share/nmap/nselib/pppoe.lua
 usr/share/nmap/nselib/proxy.lua
+usr/share/nmap/nselib/redis.lua
 usr/share/nmap/nselib/rmi.lua
 usr/share/nmap/nselib/rpc.lua
+usr/share/nmap/nselib/rpcap.lua
+usr/share/nmap/nselib/rsync.lua
+usr/share/nmap/nselib/rtsp.lua
+usr/share/nmap/nselib/sasl.lua
 usr/share/nmap/nselib/shortport.lua
+usr/share/nmap/nselib/sip.lua
 usr/share/nmap/nselib/smb.lua
 usr/share/nmap/nselib/smbauth.lua
+usr/share/nmap/nselib/smtp.lua
 usr/share/nmap/nselib/snmp.lua
+usr/share/nmap/nselib/socks.lua
+usr/share/nmap/nselib/srvloc.lua
 usr/share/nmap/nselib/ssh1.lua
 usr/share/nmap/nselib/ssh2.lua
+usr/share/nmap/nselib/sslcert.lua
 usr/share/nmap/nselib/stdnse.lua
 usr/share/nmap/nselib/strbuf.lua
 usr/share/nmap/nselib/strict.lua
+usr/share/nmap/nselib/stun.lua
 usr/share/nmap/nselib/tab.lua
 usr/share/nmap/nselib/target.lua
+usr/share/nmap/nselib/tftp.lua
 usr/share/nmap/nselib/tns.lua
 usr/share/nmap/nselib/unpwdb.lua
 usr/share/nmap/nselib/upnp.lua
 usr/share/nmap/nselib/url.lua
+usr/share/nmap/nselib/versant.lua
 usr/share/nmap/nselib/vnc.lua
+usr/share/nmap/nselib/vulns.lua
+usr/share/nmap/nselib/vuzedht.lua
 usr/share/nmap/nselib/wsdd.lua
+usr/share/nmap/nselib/xdmcp.lua
+usr/share/nmap/nselib/xmpp.lua
 #usr/share/nmap/scripts
+usr/share/nmap/scripts/acarsd-info.nse
+usr/share/nmap/scripts/address-info.nse
 usr/share/nmap/scripts/afp-brute.nse
+usr/share/nmap/scripts/afp-ls.nse
 usr/share/nmap/scripts/afp-path-vuln.nse
 usr/share/nmap/scripts/afp-serverinfo.nse
 usr/share/nmap/scripts/afp-showmount.nse
+usr/share/nmap/scripts/amqp-info.nse
 usr/share/nmap/scripts/asn-query.nse
 usr/share/nmap/scripts/auth-owners.nse
 usr/share/nmap/scripts/auth-spoof.nse
+usr/share/nmap/scripts/backorifice-brute.nse
+usr/share/nmap/scripts/backorifice-info.nse
 usr/share/nmap/scripts/banner.nse
+usr/share/nmap/scripts/bitcoin-getaddr.nse
+usr/share/nmap/scripts/bitcoin-info.nse
+usr/share/nmap/scripts/bitcoinrpc-info.nse
+usr/share/nmap/scripts/bittorrent-discovery.nse
+usr/share/nmap/scripts/broadcast-avahi-dos.nse
+usr/share/nmap/scripts/broadcast-db2-discover.nse
+usr/share/nmap/scripts/broadcast-dhcp-discover.nse
+usr/share/nmap/scripts/broadcast-dhcp6-discover.nse
 usr/share/nmap/scripts/broadcast-dns-service-discovery.nse
 usr/share/nmap/scripts/broadcast-dropbox-listener.nse
+usr/share/nmap/scripts/broadcast-listener.nse
 usr/share/nmap/scripts/broadcast-ms-sql-discover.nse
+usr/share/nmap/scripts/broadcast-netbios-master-browser.nse
+usr/share/nmap/scripts/broadcast-networker-discover.nse
+usr/share/nmap/scripts/broadcast-novell-locate.nse
+usr/share/nmap/scripts/broadcast-pc-anywhere.nse
+usr/share/nmap/scripts/broadcast-pc-duo.nse
+usr/share/nmap/scripts/broadcast-ping.nse
+usr/share/nmap/scripts/broadcast-pppoe-discover.nse
+usr/share/nmap/scripts/broadcast-rip-discover.nse
+usr/share/nmap/scripts/broadcast-ripng-discover.nse
+usr/share/nmap/scripts/broadcast-sybase-asa-discover.nse
 usr/share/nmap/scripts/broadcast-upnp-info.nse
+usr/share/nmap/scripts/broadcast-versant-locate.nse
+usr/share/nmap/scripts/broadcast-wake-on-lan.nse
+usr/share/nmap/scripts/broadcast-wpad-discover.nse
 usr/share/nmap/scripts/broadcast-wsdd-discover.nse
+usr/share/nmap/scripts/broadcast-xdmcp-discover.nse
+usr/share/nmap/scripts/cccam-version.nse
 usr/share/nmap/scripts/citrix-brute-xml.nse
 usr/share/nmap/scripts/citrix-enum-apps-xml.nse
 usr/share/nmap/scripts/citrix-enum-apps.nse
@@ -147,24 +220,38 @@ usr/share/nmap/scripts/citrix-enum-servers-xml.nse
 usr/share/nmap/scripts/citrix-enum-servers.nse
 usr/share/nmap/scripts/couchdb-databases.nse
 usr/share/nmap/scripts/couchdb-stats.nse
+usr/share/nmap/scripts/creds-summary.nse
+usr/share/nmap/scripts/cvs-brute-repository.nse
+usr/share/nmap/scripts/cvs-brute.nse
 usr/share/nmap/scripts/daap-get-library.nse
 usr/share/nmap/scripts/daytime.nse
 usr/share/nmap/scripts/db2-das-info.nse
 usr/share/nmap/scripts/db2-discover.nse
 usr/share/nmap/scripts/dhcp-discover.nse
+usr/share/nmap/scripts/dns-blacklist.nse
+usr/share/nmap/scripts/dns-brute.nse
 usr/share/nmap/scripts/dns-cache-snoop.nse
+usr/share/nmap/scripts/dns-client-subnet-scan.nse
 usr/share/nmap/scripts/dns-fuzz.nse
+usr/share/nmap/scripts/dns-nsec-enum.nse
+usr/share/nmap/scripts/dns-nsid.nse
 usr/share/nmap/scripts/dns-random-srcport.nse
 usr/share/nmap/scripts/dns-random-txid.nse
 usr/share/nmap/scripts/dns-recursion.nse
 usr/share/nmap/scripts/dns-service-discovery.nse
+usr/share/nmap/scripts/dns-srv-enum.nse
 usr/share/nmap/scripts/dns-update.nse
+usr/share/nmap/scripts/dns-zeustracker.nse
 usr/share/nmap/scripts/dns-zone-transfer.nse
 usr/share/nmap/scripts/domcon-brute.nse
 usr/share/nmap/scripts/domcon-cmd.nse
 usr/share/nmap/scripts/domino-enum-users.nse
+usr/share/nmap/scripts/dpap-brute.nse
 usr/share/nmap/scripts/drda-brute.nse
 usr/share/nmap/scripts/drda-info.nse
+usr/share/nmap/scripts/duplicates.nse
+usr/share/nmap/scripts/eap-info.nse
+usr/share/nmap/scripts/epmd-info.nse
 usr/share/nmap/scripts/finger.nse
 usr/share/nmap/scripts/firewalk.nse
 usr/share/nmap/scripts/ftp-anon.nse
@@ -172,56 +259,121 @@ usr/share/nmap/scripts/ftp-bounce.nse
 usr/share/nmap/scripts/ftp-brute.nse
 usr/share/nmap/scripts/ftp-libopie.nse
 usr/share/nmap/scripts/ftp-proftpd-backdoor.nse
+usr/share/nmap/scripts/ftp-vsftpd-backdoor.nse
+usr/share/nmap/scripts/ftp-vuln-cve2010-4221.nse
+usr/share/nmap/scripts/ganglia-info.nse
 usr/share/nmap/scripts/giop-info.nse
 usr/share/nmap/scripts/gopher-ls.nse
+usr/share/nmap/scripts/hadoop-datanode-info.nse
+usr/share/nmap/scripts/hadoop-jobtracker-info.nse
+usr/share/nmap/scripts/hadoop-namenode-info.nse
+usr/share/nmap/scripts/hadoop-secondary-namenode-info.nse
+usr/share/nmap/scripts/hadoop-tasktracker-info.nse
+usr/share/nmap/scripts/hbase-master-info.nse
+usr/share/nmap/scripts/hbase-region-info.nse
 usr/share/nmap/scripts/hddtemp-info.nse
-usr/share/nmap/scripts/hostmap.nse
+usr/share/nmap/scripts/hostmap-bfk.nse
+usr/share/nmap/scripts/http-affiliate-id.nse
+usr/share/nmap/scripts/http-apache-negotiation.nse
+usr/share/nmap/scripts/http-auth-finder.nse
 usr/share/nmap/scripts/http-auth.nse
+usr/share/nmap/scripts/http-awstatstotals-exec.nse
+usr/share/nmap/scripts/http-axis2-dir-traversal.nse
+usr/share/nmap/scripts/http-backup-finder.nse
+usr/share/nmap/scripts/http-barracuda-dir-traversal.nse
 usr/share/nmap/scripts/http-brute.nse
+usr/share/nmap/scripts/http-cakephp-version.nse
+usr/share/nmap/scripts/http-chrono.nse
+usr/share/nmap/scripts/http-config-backup.nse
+usr/share/nmap/scripts/http-cors.nse
 usr/share/nmap/scripts/http-date.nse
+usr/share/nmap/scripts/http-default-accounts.nse
 usr/share/nmap/scripts/http-domino-enum-passwords.nse
+usr/share/nmap/scripts/http-email-harvest.nse
 usr/share/nmap/scripts/http-enum.nse
 usr/share/nmap/scripts/http-favicon.nse
 usr/share/nmap/scripts/http-form-brute.nse
+usr/share/nmap/scripts/http-generator.nse
+usr/share/nmap/scripts/http-google-malware.nse
+usr/share/nmap/scripts/http-grep.nse
 usr/share/nmap/scripts/http-headers.nse
 usr/share/nmap/scripts/http-iis-webdav-vuln.nse
+usr/share/nmap/scripts/http-joomla-brute.nse
+usr/share/nmap/scripts/http-litespeed-sourcecode-download.nse
+usr/share/nmap/scripts/http-majordomo2-dir-traversal.nse
 usr/share/nmap/scripts/http-malware-host.nse
+usr/share/nmap/scripts/http-method-tamper.nse
 usr/share/nmap/scripts/http-methods.nse
 usr/share/nmap/scripts/http-open-proxy.nse
+usr/share/nmap/scripts/http-open-redirect.nse
 usr/share/nmap/scripts/http-passwd.nse
 usr/share/nmap/scripts/http-php-version.nse
+usr/share/nmap/scripts/http-proxy-brute.nse
+usr/share/nmap/scripts/http-put.nse
+usr/share/nmap/scripts/http-qnap-nas-info.nse
 usr/share/nmap/scripts/http-robots.txt.nse
+usr/share/nmap/scripts/http-robtex-reverse-ip.nse
 usr/share/nmap/scripts/http-title.nse
 usr/share/nmap/scripts/http-trace.nse
+usr/share/nmap/scripts/http-unsafe-output-escaping.nse
 usr/share/nmap/scripts/http-userdir-enum.nse
 usr/share/nmap/scripts/http-vhosts.nse
 usr/share/nmap/scripts/http-vmware-path-vuln.nse
+usr/share/nmap/scripts/http-vuln-cve2009-3960.nse
+usr/share/nmap/scripts/http-vuln-cve2010-2861.nse
+usr/share/nmap/scripts/http-vuln-cve2011-3192.nse
+usr/share/nmap/scripts/http-vuln-cve2011-3368.nse
+usr/share/nmap/scripts/http-vuln-cve2012-1823.nse
+usr/share/nmap/scripts/http-waf-detect.nse
+usr/share/nmap/scripts/http-wordpress-brute.nse
+usr/share/nmap/scripts/http-wordpress-enum.nse
+usr/share/nmap/scripts/http-wordpress-plugins.nse
+usr/share/nmap/scripts/iax2-brute.nse
 usr/share/nmap/scripts/iax2-version.nse
+usr/share/nmap/scripts/imap-brute.nse
 usr/share/nmap/scripts/imap-capabilities.nse
 usr/share/nmap/scripts/informix-brute.nse
 usr/share/nmap/scripts/informix-query.nse
 usr/share/nmap/scripts/informix-tables.nse
+usr/share/nmap/scripts/ip-geolocation-geobytes.nse
+usr/share/nmap/scripts/ip-geolocation-geoplugin.nse
+usr/share/nmap/scripts/ip-geolocation-ipinfodb.nse
+usr/share/nmap/scripts/ip-geolocation-maxmind.nse
 usr/share/nmap/scripts/ipidseq.nse
+usr/share/nmap/scripts/ipv6-node-info.nse
+usr/share/nmap/scripts/irc-botnet-channels.nse
+usr/share/nmap/scripts/irc-brute.nse
 usr/share/nmap/scripts/irc-info.nse
 usr/share/nmap/scripts/irc-unrealircd-backdoor.nse
 usr/share/nmap/scripts/iscsi-brute.nse
 usr/share/nmap/scripts/iscsi-info.nse
 usr/share/nmap/scripts/jdwp-version.nse
+usr/share/nmap/scripts/krb5-enum-users.nse
 usr/share/nmap/scripts/ldap-brute.nse
+usr/share/nmap/scripts/ldap-novell-getpass.nse
 usr/share/nmap/scripts/ldap-rootdse.nse
 usr/share/nmap/scripts/ldap-search.nse
 usr/share/nmap/scripts/lexmark-config.nse
+usr/share/nmap/scripts/lltd-discovery.nse
+usr/share/nmap/scripts/maxdb-info.nse
+usr/share/nmap/scripts/membase-brute.nse
+usr/share/nmap/scripts/membase-http-info.nse
+usr/share/nmap/scripts/memcached-info.nse
+usr/share/nmap/scripts/metasploit-xmlrpc-brute.nse
 usr/share/nmap/scripts/modbus-discover.nse
+usr/share/nmap/scripts/mongodb-brute.nse
 usr/share/nmap/scripts/mongodb-databases.nse
 usr/share/nmap/scripts/mongodb-info.nse
 usr/share/nmap/scripts/ms-sql-brute.nse
 usr/share/nmap/scripts/ms-sql-config.nse
+usr/share/nmap/scripts/ms-sql-dump-hashes.nse
 usr/share/nmap/scripts/ms-sql-empty-password.nse
 usr/share/nmap/scripts/ms-sql-hasdbaccess.nse
 usr/share/nmap/scripts/ms-sql-info.nse
 usr/share/nmap/scripts/ms-sql-query.nse
 usr/share/nmap/scripts/ms-sql-tables.nse
 usr/share/nmap/scripts/ms-sql-xp-cmdshell.nse
+usr/share/nmap/scripts/mysql-audit.nse
 usr/share/nmap/scripts/mysql-brute.nse
 usr/share/nmap/scripts/mysql-databases.nse
 usr/share/nmap/scripts/mysql-empty-password.nse
@@ -229,20 +381,34 @@ usr/share/nmap/scripts/mysql-info.nse
 usr/share/nmap/scripts/mysql-users.nse
 usr/share/nmap/scripts/mysql-variables.nse
 usr/share/nmap/scripts/nat-pmp-info.nse
+usr/share/nmap/scripts/nat-pmp-mapport.nse
 usr/share/nmap/scripts/nbstat.nse
+usr/share/nmap/scripts/ncp-enum-users.nse
+usr/share/nmap/scripts/ncp-serverinfo.nse
+usr/share/nmap/scripts/ndmp-fs-info.nse
+usr/share/nmap/scripts/ndmp-version.nse
+usr/share/nmap/scripts/nessus-brute.nse
+usr/share/nmap/scripts/nessus-xmlrpc-brute.nse
 usr/share/nmap/scripts/netbus-auth-bypass.nse
 usr/share/nmap/scripts/netbus-brute.nse
 usr/share/nmap/scripts/netbus-info.nse
 usr/share/nmap/scripts/netbus-version.nse
+usr/share/nmap/scripts/nexpose-brute.nse
 usr/share/nmap/scripts/nfs-ls.nse
 usr/share/nmap/scripts/nfs-showmount.nse
 usr/share/nmap/scripts/nfs-statfs.nse
+usr/share/nmap/scripts/nping-brute.nse
 usr/share/nmap/scripts/nrpe-enum.nse
 usr/share/nmap/scripts/ntp-info.nse
 usr/share/nmap/scripts/ntp-monlist.nse
+usr/share/nmap/scripts/omp2-brute.nse
+usr/share/nmap/scripts/omp2-enum-targets.nse
+usr/share/nmap/scripts/openlookup-info.nse
+usr/share/nmap/scripts/openvas-otp-brute.nse
 usr/share/nmap/scripts/oracle-brute.nse
 usr/share/nmap/scripts/oracle-enum-users.nse
 usr/share/nmap/scripts/oracle-sid-brute.nse
+usr/share/nmap/scripts/ovs-agent-version.nse
 usr/share/nmap/scripts/p2p-conficker.nse
 usr/share/nmap/scripts/path-mtu.nse
 usr/share/nmap/scripts/pgsql-brute.nse
@@ -251,11 +417,30 @@ usr/share/nmap/scripts/pop3-brute.nse
 usr/share/nmap/scripts/pop3-capabilities.nse
 usr/share/nmap/scripts/pptp-version.nse
 usr/share/nmap/scripts/qscan.nse
+usr/share/nmap/scripts/quake3-info.nse
+usr/share/nmap/scripts/quake3-master-getservers.nse
+usr/share/nmap/scripts/rdp-vuln-ms12-020.nse
 usr/share/nmap/scripts/realvnc-auth-bypass.nse
+usr/share/nmap/scripts/redis-brute.nse
+usr/share/nmap/scripts/redis-info.nse
 usr/share/nmap/scripts/resolveall.nse
+usr/share/nmap/scripts/reverse-index.nse
+usr/share/nmap/scripts/rexec-brute.nse
+usr/share/nmap/scripts/riak-http-info.nse
+usr/share/nmap/scripts/rlogin-brute.nse
 usr/share/nmap/scripts/rmi-dumpregistry.nse
+usr/share/nmap/scripts/rpcap-brute.nse
+usr/share/nmap/scripts/rpcap-info.nse
 usr/share/nmap/scripts/rpcinfo.nse
+usr/share/nmap/scripts/rsync-brute.nse
+usr/share/nmap/scripts/rsync-list-modules.nse
+usr/share/nmap/scripts/rtsp-methods.nse
+usr/share/nmap/scripts/rtsp-url-brute.nse
+usr/share/nmap/scripts/samba-vuln-cve-2012-1182.nse
 usr/share/nmap/scripts/script.db
+usr/share/nmap/scripts/servicetags.nse
+usr/share/nmap/scripts/sip-brute.nse
+usr/share/nmap/scripts/sip-enum-users.nse
 usr/share/nmap/scripts/skypev2-version.nse
 usr/share/nmap/scripts/smb-brute.nse
 usr/share/nmap/scripts/smb-check-vulns.nse
@@ -266,19 +451,25 @@ usr/share/nmap/scripts/smb-enum-sessions.nse
 usr/share/nmap/scripts/smb-enum-shares.nse
 usr/share/nmap/scripts/smb-enum-users.nse
 usr/share/nmap/scripts/smb-flood.nse
+usr/share/nmap/scripts/smb-mbenum.nse
 usr/share/nmap/scripts/smb-os-discovery.nse
 usr/share/nmap/scripts/smb-psexec.nse
 usr/share/nmap/scripts/smb-security-mode.nse
 usr/share/nmap/scripts/smb-server-stats.nse
 usr/share/nmap/scripts/smb-system-info.nse
 usr/share/nmap/scripts/smbv2-enabled.nse
+usr/share/nmap/scripts/smtp-brute.nse
 usr/share/nmap/scripts/smtp-commands.nse
 usr/share/nmap/scripts/smtp-enum-users.nse
 usr/share/nmap/scripts/smtp-open-relay.nse
 usr/share/nmap/scripts/smtp-strangeport.nse
+usr/share/nmap/scripts/smtp-vuln-cve2010-4344.nse
+usr/share/nmap/scripts/smtp-vuln-cve2011-1720.nse
+usr/share/nmap/scripts/smtp-vuln-cve2011-1764.nse
 usr/share/nmap/scripts/sniffer-detect.nse
 usr/share/nmap/scripts/snmp-brute.nse
 usr/share/nmap/scripts/snmp-interfaces.nse
+usr/share/nmap/scripts/snmp-ios-config.nse
 usr/share/nmap/scripts/snmp-netstat.nse
 usr/share/nmap/scripts/snmp-processes.nse
 usr/share/nmap/scripts/snmp-sysdescr.nse
@@ -286,6 +477,8 @@ usr/share/nmap/scripts/snmp-win32-services.nse
 usr/share/nmap/scripts/snmp-win32-shares.nse
 usr/share/nmap/scripts/snmp-win32-software.nse
 usr/share/nmap/scripts/snmp-win32-users.nse
+usr/share/nmap/scripts/socks-auth-info.nse
+usr/share/nmap/scripts/socks-brute.nse
 usr/share/nmap/scripts/socks-open-proxy.nse
 usr/share/nmap/scripts/sql-injection.nse
 usr/share/nmap/scripts/ssh-hostkey.nse
@@ -293,15 +486,36 @@ usr/share/nmap/scripts/ssh2-enum-algos.nse
 usr/share/nmap/scripts/sshv1.nse
 usr/share/nmap/scripts/ssl-cert.nse
 usr/share/nmap/scripts/ssl-enum-ciphers.nse
+usr/share/nmap/scripts/ssl-google-cert-catalog.nse
+usr/share/nmap/scripts/ssl-known-key.nse
 usr/share/nmap/scripts/sslv2.nse
+usr/share/nmap/scripts/stun-info.nse
+usr/share/nmap/scripts/stun-version.nse
 usr/share/nmap/scripts/stuxnet-detect.nse
 usr/share/nmap/scripts/svn-brute.nse
+usr/share/nmap/scripts/targets-asn.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-echo.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-invalid-dst.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-mld.nse
+usr/share/nmap/scripts/targets-ipv6-multicast-slaac.nse
+usr/share/nmap/scripts/targets-sniffer.nse
 usr/share/nmap/scripts/targets-traceroute.nse
 usr/share/nmap/scripts/telnet-brute.nse
+usr/share/nmap/scripts/telnet-encryption.nse
+usr/share/nmap/scripts/tftp-enum.nse
+usr/share/nmap/scripts/unusual-port.nse
 usr/share/nmap/scripts/upnp-info.nse
+usr/share/nmap/scripts/url-snarf.nse
+usr/share/nmap/scripts/versant-info.nse
+usr/share/nmap/scripts/vmauthd-brute.nse
 usr/share/nmap/scripts/vnc-brute.nse
 usr/share/nmap/scripts/vnc-info.nse
+usr/share/nmap/scripts/voldemort-info.nse
+usr/share/nmap/scripts/vuze-dht-info.nse
 usr/share/nmap/scripts/wdb-version.nse
 usr/share/nmap/scripts/whois.nse
 usr/share/nmap/scripts/wsdd-discover.nse
 usr/share/nmap/scripts/x11-access.nse
+usr/share/nmap/scripts/xdmcp-discover.nse
+usr/share/nmap/scripts/xmpp-brute.nse
+usr/share/nmap/scripts/xmpp-info.nse

diff --git a/lfs/GeoIP b/lfs/GeoIP
index aeb358d28e4d0a57eb98f3f7bcf4e20f071acc39..41a82e929a3faeb258031fc9a055a82e34a90215 100644 (file)
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.17
-DATVER     = 04072012
+DATVER     = 05092012
 
 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 = 1395bec12f8a5f0b1e889581271ed5ce
+GeoIP.dat-$(DATVER).gz_MD5 = c053f11cb8383fb8f4826591b0cbae3d
 
 install : $(TARGET)
 

diff --git a/lfs/apcupsd b/lfs/apcupsd
index a0da9357eb014413011ae86659d7cd98c2de5062..4e9137b111ed9a2fb74a4e551ac2059095810dcd 100644 (file)
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.14.4
+VER        = 3.14.10
 
 THISAPP    = apcupsd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = apcupsd
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 78811129db1a882b9a2b9afd540470b3
+$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23
 
 install : $(TARGET)
 
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(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/apcupsd-3.14.4-fix-gcc44.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --enable-usb --enable-cgi \
                                        --with-cgi-bin=/srv/web/ipfire/cgi-bin
        cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/lfs/configroot b/lfs/configroot
index f35361469d4d99212339ebacc7b067d90bcc3817..90f5afab6cffe0b1e28f134216ca4e61e67ce3f7 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -100,6 +100,7 @@ $(TARGET) :
        cp $(DIR_SRC)/config/cfgroot/time-settings              $(CONFIG_ROOT)/time/settings
        cp $(DIR_SRC)/config/cfgroot/logging-settings           $(CONFIG_ROOT)/logging/settings
        cp $(DIR_SRC)/config/cfgroot/useragents                 $(CONFIG_ROOT)/proxy/advanced
+       cp $(DIR_SRC)/config/cfgroot/ethernet-vlans             $(CONFIG_ROOT)/ethernet/vlans
        cp $(DIR_SRC)/langs/list                                        $(CONFIG_ROOT)/langs/
 
        # Oneliner configfiles

diff --git a/lfs/fping b/lfs/fping
new file mode 100644 (file)
index 0000000..3b7b97c
--- /dev/null
+++ b/lfs/fping
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.1
+
+THISAPP    = fping-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = fping
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = a2bbf3316da8c7b47a1a0ffe959d5d9e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/initscripts b/lfs/initscripts
index 03cec8031cb64c15d2f19ff611d5795f6672d07c..7210c0d2ea8e97a9dc216fb4372766c22d33fbb8 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -170,6 +170,7 @@ $(TARGET) :
        ln -sf ../init.d/firstsetup  /etc/rc.d/rcsysinit.d/S75firstsetup
        ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
        ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl
+       ln -sf ../init.d/network-vlans /etc/rc.d/rcsysinit.d/S91network-vlans
 
        ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
        ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall

diff --git a/lfs/nmap b/lfs/nmap
index 5ff3221ab55052bb892f60cd67222948fdfb2796..38b6da912db81931b387f0996065f1be7603b1ab 100644 (file)
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.51
+VER        = 6.01
 
 THISAPP    = nmap-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nmap
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0b80d2cb92ace5ebba8095a4c2850275
+$(DL_FILE)_MD5 = a1a71940f238abb835dbf3ee7412bcea
 
 install : $(TARGET)
 

diff --git a/lfs/php b/lfs/php
index c5aae146b7a5bdf8ecc0bbb3ed000f6bbba9bd3f..58f442ce4c839dba7c381cb4345f660b151dfba4 100644 (file)
--- a/lfs/php
+++ b/lfs/php
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.3.15
+VER        = 5.3.16
 
 THISAPP    = php-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
 Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
 
-$(DL_FILE)_MD5 = 5cfcfd0fa4c4da7576f397073e7993cc
+$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be
 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
 

diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch
index 09a0b682f25c26c3b9515d8a0616a446d89b2975..f8aea5fd6b81d51f87d1b136b82ec5c2df4b876b 100644 (file)
--- a/lfs/usb_modeswitch
+++ b/lfs/usb_modeswitch
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.3
+VER        = 1.2.4
 
 THISAPP    = usb-modeswitch-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9b29e8b0d93d7604a9e5efc4696d37a3
+$(DL_FILE)_MD5 = dbd4ce7966d7b4a5a0604a8280f7164d
 
 install : $(TARGET)
 

diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data
index 46c7c0d98e095645bf99046a0a2d838ccf35b682..5beecda7564007a9e81d1f4b3d94dbd407e7d5d3 100644 (file)
--- a/lfs/usb_modeswitch_data
+++ b/lfs/usb_modeswitch_data
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20120531
+VER        = 20120815
 
 THISAPP    = usb-modeswitch-data-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4a948331d5b9fccba4a89d3e62040cc3
+$(DL_FILE)_MD5 = 12d7de3210e45ad6f48791d12bbdbf61
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 5a5d0d630c632c58d3424ddd5fcf1c04ac55b635..f5407ebacf262ba89affe4cae830560d474e8b5f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
 CORE="62"                                                      # Core Level (Filename)
-PAKFIRE_CORE="61"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="62"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -759,6 +759,7 @@ buildipfire() {
   ipfiremake tcpick
   ipfiremake minidlna
   ipfiremake acpid
+  ipfiremake fping
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild

diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids
index 27618a6db046aaf14b55e0106a837c3357f4db5a..1beb52dbe1dc210a2ad46039f9a0fcf7fd989ede 100644 (file)
--- a/src/hwdata/pci.ids
+++ b/src/hwdata/pci.ids
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2012.04.04
-#      Date:    2012-04-04 03:15:01
+#      Version: 2012.09.06
+#      Date:    2012-09-06 03:15:02
 #
 #      Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #      PCI ID Project at http://pci-ids.ucw.cz/.
@@ -88,7 +88,6 @@
 04b3  IBM Corp.
        4001  Remote System Administration device [RSA2]
 050d  Belkin
-058f  Alcor Micro Corporation
 05a9  OmniVision
        8519  OV519 series
 05e3  CyberDoor
@@ -122,8 +121,8 @@
 08e6  Gemalto NV
 08ff  AuthenTec
        afe4  [Anchor] AF-S2 FingerLoc Sensor Module
-0925  First International Computer, Inc.
-       1234  VA-502 Mainboard
+0925  VIA Technologies, Inc. (Wrong ID)
+       1234  VT82C686/A/B USB Controller
 093a  PixArt Imaging Inc.
        010e  Innovage Mini Digital Camera
        010f  SDC-300 Webcam
@@ -202,6 +201,7 @@
        7020  USB Controller
        a0ec  Fibre Channel Host Controller
        a0f0  Advanced System Management Controller
+               0e11 b0f3  ProLiant DL360
        a0f3  Triflex PCI to ISA Bridge
        a0f7  PCI Hotplug Controller
                8086 002a  PCI Hotplug Controller A
@@ -325,6 +325,8 @@
                4c53 1080  CT8 mainboard
                4c53 1300  P017 mezzanine (32-bit PMC)
                4c53 1310  P017 mezzanine (64-bit PMC)
+       002f  MegaRAID SAS 2208 IOV [Thunderbolt]
+               1028 1f3e  SPERC 8
        0030  53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI
                0e11 00da  ProLiant ML 350
                1028 0123  LSI Logic 1020/1030
@@ -375,6 +377,11 @@
        0059  MegaRAID SAS 8208ELP/8208ELP
        005a  SAS1066E PCI-Express Fusion-MPT SAS
        005b  MegaRAID SAS 2208 [Thunderbolt]
+               1000 9265  MegaRAID SAS 9265-8i
+               1000 9266  MegaRAID SAS 9266-8i
+               1000 9268  MegaRAID SAS 9265CV-8i / 9270CV-8i
+               1014 040b  ServeRAID M5110 SAS/SATA Controller
+               1014 0412  ServeRAID M5110e SAS/SATA Controller
                1028 1f2d  PERC H810 Adapter
                1028 1f30  PERC H710 Embedded
                1028 1f31  PERC H710P Adapter
@@ -383,10 +390,11 @@
                1028 1f35  PERC H710 Adapter
                1028 1f37  PERC H710 Mini (for blades)
                1028 1f38  PERC H710 Mini (for monolithics)
-               8086 3513  RMS25PB080 RAID Controller
+               8086 3513  RMS25CB080 RAID Controller
        005c  SAS1064A PCI-X Fusion-MPT SAS
        005d  MegaRAID SAS-3 3108 [Invader]
        005e  SAS1066 PCI-X Fusion-MPT SAS
+       005f  MegaRAID SAS-3 3008 [Fury]
        0060  MegaRAID SAS 1078
                1000 1006  MegaRAID SAS 8888ELP
                1000 100a  MegaRAID SAS 8708ELP
@@ -436,6 +444,7 @@
        0073  MegaRAID SAS 2008 [Falcon]
                1000 9240  MegaRAID SAS 9240-8i
                1000 9241  MegaRAID SAS 9240-4i
+               1000 92a0  MegaRAID SAS 9220-8i
                1014 03b1  ServeRAID M1015 SAS/SATA Controller
                1028 1f4e  PERC H310 Adapter
                1028 1f4f  PERC H310 Integrated
@@ -608,7 +617,9 @@
 # nee ATI Technologies Inc.
 1002  Advanced Micro Devices [AMD] nee ATI
        1314  Wrestler HDMI Audio [Radeon HD 6250/6310]
+               174b 1001  Sapphire PURE Fusion Mini
        1714  BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series]
+               103c 168b  ProBook 4535s
        3150  M24 1P [Radeon Mobility X600]
                103c 0934  nx8220
        3151  M24 [FireMV 2400]
@@ -788,6 +799,8 @@
                1179 ff50  Satellite P305D-S8995E
                1458 4385  GA-MA770-DS3rev2.0 Motherboard
                1462 7368  K9AG Neo2
+               15d9 a811  H8DGU
+               174b 1001  Sapphire PURE Fusion Mini
                17f2 5000  KI690-AM2 Motherboard
        4386  SB600 USB Controller (EHCI)
                103c 280a  DC5750 Microtower
@@ -840,6 +853,7 @@
                103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
                1043 8443  M5A88-V EVO
+               174b 1001  Sapphire PURE Fusion Mini
        4392  SB7x0/SB8x0/SB9x0 SATA Controller [Non-RAID5 mode]
        4393  SB7x0/SB8x0/SB9x0 SATA Controller [RAID5 mode]
        4394  SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode]
@@ -848,21 +862,28 @@
                103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
                1043 8443  M5A88-V EVO
+               15d9 a811  H8DGU
+               174b 1001  Sapphire PURE Fusion Mini
        4397  SB7x0/SB8x0/SB9x0 USB OHCI0 Controller
                103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
                1043 8443  M5A88-V EVO
+               15d9 a811  H8DGU
+               174b 1001  Sapphire PURE Fusion Mini
        4398  SB7x0 USB OHCI1 Controller
                1043 82ef  M3A78-EH Motherboard
+               15d9 a811  H8DGU
        4399  SB7x0/SB8x0/SB9x0 USB OHCI2 Controller
                1043 82ef  M3A78-EH Motherboard
                1043 8443  M5A88-V EVO
+               174b 1001  Sapphire PURE Fusion Mini
        439c  SB7x0/SB8x0/SB9x0 IDE Controller
                1043 82ef  M3A78-EH Motherboard
        439d  SB7x0/SB8x0/SB9x0 LPC host controller
                103c 1611  Pavilion DM1Z-3000
                1043 82ef  M3A78-EH Motherboard
                1043 8443  M5A88-V EVO
+               174b 1001  Sapphire PURE Fusion Mini
        43a0  SB700/SB800/SB900 PCI to PCI bridge (PCIE port 0)
        43a1  SB700/SB800/SB900 PCI to PCI bridge (PCIE port 1)
        43a2  SB900 PCI to PCI bridge (PCIE port 2)
@@ -1394,12 +1415,14 @@
        5a10  RD890 Northbridge only dual slot (2x16) PCI-e GFX Hydra part
        5a11  RD890 Northbridge only single slot PCI-e GFX Hydra part
        5a12  RD890 Northbridge only dual slot (2x8) PCI-e GFX Hydra part
+               15d9 a811  H8DGU
        5a13  RD890 PCI to PCI bridge (external gfx0 port A)
        5a14  RD890 PCI to PCI bridge (external gfx0 port B)
        5a15  RD890 PCI to PCI bridge (PCI express gpp port A)
        5a16  RD890 PCI to PCI bridge (PCI express gpp port B)
        5a17  RD890 PCI to PCI bridge (PCI express gpp port C)
        5a18  RD890 PCI to PCI bridge (PCI express gpp port D)
+               15d9 a811  H8DGU
        5a19  RD890 PCI to PCI bridge (PCI express gpp port E)
        5a1a  RD890 PCI to PCI bridge (PCI express gpp port F)
        5a1b  RD890 PCI to PCI bridge (PCI express gpp port G)
@@ -1407,6 +1430,7 @@
        5a1d  RD890 PCI to PCI bridge (external gfx1 port A)
        5a1e  RD890 PCI to PCI bridge (external gfx1 port B)
        5a1f  RD890 PCI to PCI bridge (NB-SB link)
+               15d9 a811  H8DGU
        5a23  RD990 I/O Memory Management Unit (IOMMU)
        5a33  Radeon Xpress 200 Host Bridge
        5a34  RS480 PCI-X Root Port
@@ -1488,26 +1512,30 @@
        5e6d  RV410 [Radeon X700 (PCIE)] (Secondary)
                148c 2117  PowerColor Bravo X700
        5f57  R423 [Radeon X800XT (PCIE)]
+       6704  Cayman PRO GL [FirePro V7900]
        6707  Cayman LE GL [FirePro V5900]
        6718  Cayman XT [Radeon HD 6970]
        6719  Cayman PRO [Radeon HD 6950]
        671d  Antilles [AMD Radeon HD 6990]
        671f  Cayman [Radeon HD 6900 Series]
        6720  Blackcomb [Radeon HD 6900M series]
-       6738  Barts XT [ATI Radeon HD 6800 Series]
-       6739  Barts PRO [ATI Radeon HD 6800 Series]
+       6738  Barts XT [Radeon HD 6800 Series]
+       6739  Barts PRO [Radeon HD 6800 Series]
+               1043 03b4  EAH6850 [Radeon HD 6850]
        673e  Barts LE [AMD Radeon HD 6700 Series]
        6740  Whistler XT [AMD Radeon HD 6700M Series]
        6741  Whistler [AMD Radeon HD 6600M Series]
+               106b 00e2  MacBookPro8,2 [Core i7, 15", Late 2011]
        6742  Whistler LE [AMD Radeon HD 6625M Graphics]
        6743  Whistler [Radeon E6760]
        6749  Turks [FirePro V4900]
+       674a  Turks [AMD FirePro V3900]
        6750  Turks [AMD Radeon HD 6570]
        6751  Turks [Radeon HD 7600A Series]
        6758  Turks [Radeon HD 6670]
        6759  Turks [Radeon HD 6570]
        675d  Turks [Radeon HD 7500 Series]
-       6760  Seymour [Radeon HD 6400M Series]
+       6760  Caicos [Radeon HD 6400M/7400M Series]
                1028 04cc  Vostro 3350
        6761  Seymour LP [Radeon HD 6430M]
        6763  Seymour [Radeon E6460]
@@ -1523,6 +1551,9 @@
        6800  WIMBLEDON XT [Radeon HD 7970M]
        6818  PITCAIRN [Radeon HD 7800]
        6819  PITCAIRN PRO [Radeon HD 7800 Series]
+       682f  Cape Verde [Radeon HD 7700M Series]
+       683d  Cape Verde [Radeon HD 7700 Series]
+       683f  Cape Verde PRO [Radeon HD 7700 Series]
        6840  Thames XT/GL [Radeon HD 7600M Series]
        6841  Thames [Radeon 7500M/7600M Series]
        6843  Thames [Radeon HD 7670M]
@@ -1533,7 +1564,8 @@
        688d  Cypress [AMD FireStream 9350]
        6898  Cypress XT [Radeon HD 5870]
                1462 8032  R5870 PM2D1G
-       6899  Cypress [Radeon HD 5800 Series]
+       6899  Cypress PRO [Radeon HD 5800 Series]
+               1043 0330  EAH5850 [Radeon HD5850]
        689b  Cypress [Radeon HD 6800 Series]
        689c  Hemlock [Radeon HD 5900 Series]
        689e  Cypress LE [Radeon HD 5800 Series]
@@ -1543,6 +1575,7 @@
        68a8  Broadway [ATI Mobility Radeon HD 6800 Series]
        68a9  Juniper XT [FirePro 3D V5800]
        68b8  Juniper [Radeon HD 5700 Series]
+               106b 00cf  MacPro5,1 [Mac Pro 2.8GHz DDR3]
        68b9  Juniper [Radeon HD 5600/5700]
        68ba  Juniper XT [AMD Radeon HD 6000 Series]
        68be  Juniper [Radeon HD 5700 Series]
@@ -1565,7 +1598,7 @@
        68e5  Robson LE [AMD Radeon HD 6300M Series]
        68f1  Cedar [FirePro 2460]
        68f2  Cedar [FirePro 2270]
-       68f9  Cedar PRO [Radeon HD 5450]
+       68f9  Cedar PRO [Radeon HD 5450/6350]
                1028 010e  XPS 8300
        68fa  EG Cedar [Radeon HD 7300 Series]
        700f  PCI Bridge [IGP 320M]
@@ -1821,6 +1854,7 @@
        95c4  RV620 [Mobility Radeon HD 3400 Series]
                1002 95c4  Mobility Radeon HD 3400
        95c5  RV620 LE [Radeon HD 3450]
+               1028 0342  OptiPlex 980
        95c6  RV620 LE AGP [Radeon HD 3450]
        95c7  RV620 CE [Radeon HD 3430]
        95c9  RV620 PCI [Radeon HD 3450]
@@ -1839,6 +1873,7 @@
        9616  RS780L [Radeon HD 3000]
        9640  BeaverCreek [Radeon HD 6550D]
        9641  BeaverCreek [Mobility Radeon HD 6620G]
+       9647  BeaverCreek [Radeon HD 6520G]
        964a  BeaverCreek [Radeon HD 6530D]
        970f  RS880 HDMI Audio [Radeon HD 4200 Series]
                1043 83a2  M4A785TD Motherboard
@@ -1852,6 +1887,7 @@
                1043 843e  M5A88-V EVO
 # Radeon HD 6250 too?
        9802  Wrestler [Radeon HD 6310]
+               174b 1001  Sapphire PURE Fusion Mini
        9804  Wrestler [Radeon HD 6250]
        9806  Wrestler [Radeon HD 6320]
        9807  Wrestler [Radeon HD 6290]
@@ -1878,8 +1914,7 @@
                1028 aa68  XPS 8300
        aa80  Cayman/Antilles HDMI Audio [Radeon HD 6900 Series]
        aa88  Barts HDMI Audio [Radeon HD 6800 Series]
-# 6500, 6600 and mobile 6700 series
-       aa90  Turks HDMI Audio [Radeon HD 6000 Series]
+       aa90  Turks/Whistler HDMI Audio [Radeon HD 6000 Series]
        aa98  Caicos HDMI Audio [Radeon HD 6400 Series]
                174b aa98  Sapphire HD 6450 1GB DDR3
        aaa0  Tahiti XT HDMI Audio [Radeon HD 7970 Series]
@@ -1919,8 +1954,11 @@
                1004 0306  QSound ThunderBird PCI Audio Support Registers
                122d 1208  DSP368 Audio Support Registers
                1483 5022  XWave Thunder 3D Audio Support Registers
-       0307  Thunderbird
-       0308  Thunderbird
+       0307  SAA7785 ThunderBird PCI Audio
+               1004 0703  Philips Rhythmic Edge PSC703
+               1004 0705  Philips Seismic Edge PSC705
+               1004 0706  Philips Acoustic Edge PSC706
+       0308  SAA7785 ThunderBird PCI Audio Gameport
        0702  VAS96011 [Golden Gate II]
        0703  Tollgate
 1005  Avance Logic Inc. [ALI]
@@ -2386,7 +2424,9 @@
        1418  Family 15h (Models 10h-1fh) Processor Root Port
        1419  Family 15h (Models 10h-1fh) I/O Memory Management Unit
        1510  Family 14h Processor Root Complex
+               174b 1001  Sapphire PURE Fusion Mini
        1512  Family 14h Processor Root Port
+               174b 1001  Sapphire PURE Fusion Mini
        1513  Family 14h Processor Root Port
        1514  Family 14h Processor Root Port
        1515  Family 14h Processor Root Port
@@ -2522,6 +2562,7 @@
        780b  Hudson SMBus Controller
        780c  Hudson IDE Controller
        780d  Hudson Azalia Controller
+               103c 168b  Integrated Device Technology, Inc. [IDT] 92HD87B1/3 Audio Processor
        780e  Hudson LPC Bridge
        780f  Hudson PCI Bridge
        7812  Hudson USB XHCI Controller
@@ -2868,6 +2909,7 @@
                1028 028d  PowerEdge T410 MGA G200eW WPCM450
                1028 029c  PowerEdge M710 MGA G200eW WPCM450
                1028 02a4  PowerEdge T310 MGA G200eW WPCM450
+               15d9 a811  H8DGU
        0533  MGA G200EH
                103c 3381  iLO4
        0534  G200eR2
@@ -2897,11 +2939,10 @@
                102b ff05  MGA-G100 Productiva AGP Multi-Monitor
                110a 001e  MGA-G100 AGP
        2007  MGA Mistral
-       2527  MGA G550 AGP
+       2527  Millennium G550
                102b 0f83  Millennium G550
                102b 0f84  Millennium G550 Dual Head DDR 32Mb
                102b 1e41  Millennium G550
-# Clearly the device name should not say AGP anymore...
                102b 2300  Millennium G550 LP PCIE
        2537  Millenium P650/P750
                102b 1820  Millennium P750 64MB
@@ -3112,6 +3153,7 @@
        013a  Dual Tuner/MPEG Encoder
        0194  uPD720200 USB 3.0 Host Controller
                1028 04b2  Vostro 3350
+               1028 04da  Vostro 3750
                1043 8413  P8P67 Deluxe Motherboard
                1b96 0001  USB 3.0 PCIe Card
        01e7  uPD72873 [Firewarden] IEEE1394a OHCI 1.1 Link/2-port PHY Controller
@@ -3124,12 +3166,12 @@
 1038  AMP, Inc
 1039  Silicon Integrated Systems [SiS]
        0001  AGP Port (virtual PCI-to-PCI bridge)
-       0002  SG86C202
+       0002  AGP Port (virtual PCI-to-PCI bridge)
        0003  AGP Port (virtual PCI-to-PCI bridge)
        0004  PCI-to-PCI bridge
        0006  85C501/2/3
        0008  SiS85C503/5513 (LPC Bridge)
-       0009  ACPI
+       0009  5595 Power Management Controller
        000a  PCI-to-PCI bridge
        0016  SiS961/2/3 SMBus controller
        0018  SiS85C503/5513 (LPC Bridge)
@@ -3367,6 +3409,8 @@
        1361  BCM4312 802.11a/b/g WLAN Controller
        1371  Broadcom Corporation BCM4312 802.11a/b/g (rev 02)
        1717  Intel 82571EB dual 1 Gb Ethernet controller
+       179b  EliteBook 8470p Notebook
+       179d  EliteBook 8470p Notebook
        2910  E2910A PCIBus Exerciser
        2925  E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
        3080  Pavilion ze2028ea
@@ -3433,6 +3477,7 @@
        4037  PCIe Local Bus Adapter
        403b  PCIe Root Port
        60e8  NetRAID-2M : ZX1/M (OEM AMI MegaRAID 493)
+       780d  Hudson Azalia Controller (rev 01) - Soundcard
 103e  Solliday Engineering
 103f  Synopsys/Logic Modeling Group
 1040  Accelgraphics Inc.
@@ -3472,6 +3517,8 @@
        82e8  M3N72-D
        8383  P7P55D Series Motherboard
        83a4  Motherboard M2N68-AM SE2
+# Onboard audio for M4A89 series motherboards.
+       8410  SBx00 [Azalia]
        843e  M5A88-V EVO
 # wrong vendor ID (should have been AMD)
        9602  RS880 PCI to PCI bridge (int gfx)
@@ -3539,6 +3586,7 @@
        c825  82C825 [Firebridge 2]
        c832  82C832
        c861  82C861
+       c881  82C881 [FireLink] 1394 OHCI Link Controller
        c895  82C895
        c935  EV1935 ECTIVA MachOne PCIAudio
        d568  82C825 [Firebridge 2]
@@ -3654,7 +3702,7 @@
        8024  TSB43AB23 IEEE-1394a-2000 Controller (PHY/Link)
                107d 6620  Winfast DV2000 FireWire Controller
                1443 8024  FireBoard Blue
-               1458 1000  GA-EP45-DS5 Motherboard
+               1458 1000  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
        8025  TSB82AA2 IEEE-1394b Link Layer Controller
                1043 813c  P5P series mainboard
                1443 8025  FireBoard800
@@ -4344,6 +4392,7 @@
                103c 12dd  4Gb Fibre Channel [AB429A]
        2432  ISP2432-based 4Gb Fibre Channel to PCI Express HBA
        2532  ISP2532-based 8Gb Fibre Channel to PCI Express HBA
+               1077 0167  QME2572 Dual Port FC8 HBA Mezzanine
        3022  ISP4022-based Ethernet NIC
        3032  ISP4032-based Ethernet IPv6 NIC
        4010  ISP4010-based iSCSI TOE HBA
@@ -4391,9 +4440,7 @@
 107c  LG Electronics [Lucky Goldstar Co. Ltd]
 107d  LeadTek Research Inc.
        0000  P86C850
-       204d  [GeForce 7800 GTX] Winfast PX7800 GTX TDH
        2134  WinFast 3D S320 II
-       2971  [GeForce FX 5900] WinFast A350 TDH MyViVo
        6609  Winfast TV 2000 XP RM
        6654  Conexant CX23883 [WinFast DTV1800 H]
        6f22  WinFast PxTV1200
@@ -4465,7 +4512,6 @@
        1001  Happy Meal 10/100 Ethernet [hme]
        1100  RIO EBUS
                108e 1100  RIO EBUS on Blade 100 motherboard
-# Correction
        1101  RIO 10/100 Ethernet [eri]
                108e 1101  RIO GEM on Blade 100 motherboard
        1102  RIO 1394
@@ -5268,7 +5314,8 @@
        1001  FDC 37C922
        a011  83C170QF
        b106  SMC34C90
-10b9  ALi Corporation
+# Split off ALi Corporation in 2003
+10b9  ULi Electronics Inc.
        0101  CMI8338/C3DX PCI Audio Device
        0111  C-Media CMI8738/C3DX Audio Device (OEM)
                10b9 0111  C-Media CMI8738/C3DX Audio Device (OEM)
@@ -5485,6 +5532,7 @@
        1623  PCEA4 PCI-Express Dual Port ESCON Adapter
        2001  mb86605
        200c  MB86613L IEEE1394 OHCI 1.0 Controller
+       2010  MB86613S IEEE1394 OHCI 1.1 Controller
        2019  MB86295S [CORAL P]
        201e  MB86296S [CORAL PA]
        202b  MB86297A [Carmine Graphics Controller]
@@ -5520,7 +5568,6 @@
 10de  NVIDIA Corporation
        0008  NV1 [EDGE 3D]
        0009  NV1 [EDGE 3D]
-       0010  NV2 [Mutara V08]
        0020  NV4 [RIVA TNT]
                1043 0200  V3400 TNT
                1048 0c18  Erazor II SGRAM
@@ -5638,6 +5685,7 @@
                10f1 2865  Tomcat K8E (S2865)
                1458 0c11  GA-K8N Ultra-9 Mainboard
                1462 7100  MSI K8N Diamond
+               1462 7125  K8N Neo4-F mainboard
                147b 1c1a  KN8-Ultra Mainboard
                1565 3402  NF4 AM2L Mainboard
        0051  CK804 ISA Bridge
@@ -5648,6 +5696,7 @@
                10f1 2865  Tomcat K8E (S2865)
                1458 0c11  GA-K8N Ultra-9 Mainboard
                1462 7100  MSI K8N Diamond
+               1462 7125  K8N Neo4-F mainboard
                147b 1c1a  KN8-Ultra Mainboard
                1565 3402  NF4 AM2L Mainboard
        0053  CK804 IDE
@@ -5655,6 +5704,7 @@
                10f1 2865  Tomcat K8E (S2865)
                1458 5002  GA-K8N Ultra-9 Mainboard
                1462 7100  MSI K8N Diamond
+               1462 7125  K8N Neo4-F mainboard
                147b 1c1a  KN8-Ultra Mainboard
                1565 3402  NF4 AM2L Mainboard
        0054  CK804 Serial ATA Controller
@@ -5663,6 +5713,7 @@
                10f1 2865  Tomcat K8E (S2865)
                1458 b003  GA-K8N Ultra-9 Mainboard
                1462 7100  MSI K8N Diamond
+               1462 7125  K8N Neo4-F mainboard
                147b 1c1a  KN8-Ultra Mainboard
                1565 5401  NF4 AM2L Mainboard
        0055  CK804 Serial ATA Controller
@@ -5670,6 +5721,7 @@
                1043 815a  K8N4-E or A8N-E Mainboard
                10f1 2865  Tomcat K8E (S2865)
                1458 b003  GA-K8N Ultra-9 Mainboard
+               1462 7125  K8N Neo4-F mainboard
                147b 1c1a  KN8-Ultra Mainboard
                1565 5401  NF4 AM2L Mainboard
        0056  CK804 Ethernet Controller
@@ -5679,12 +5731,14 @@
                10f1 2865  Tomcat K8E (S2865)
                1458 e000  GA-K8N Ultra-9 Mainboard
                1462 7100  MSI K8N Diamond
+               1462 7125  K8N Neo4-F mainboard
                147b 1c1a  KN8-Ultra Mainboard
                1565 2501  NF4 AM2L Mainboard
        0058  CK804 AC'97 Modem
        0059  CK804 AC'97 Audio Controller
                1043 812a  K8N4-E or A8N-E Mainboard
                10f1 2865  Tomcat K8E (S2865)
+               1462 7585  K8N Neo4-F mainboard
                147b 1c1a  KN8-Ultra Mainboard
                1565 8211  NF4 AM2L Mainboard
        005a  CK804 USB Controller
@@ -5693,6 +5747,7 @@
                10f1 2865  Tomcat K8E (S2865)
                1458 5004  GA-K8N Ultra-9 Mainboard
                1462 7100  MSI K8N Diamond
+               1462 7125  K8N Neo4-F mainboard
                147b 1c1a  KN8-Ultra Mainboard
                1565 3402  NF4 AM2L Mainboard
        005b  CK804 USB Controller
@@ -5701,6 +5756,7 @@
                10f1 2865  Tomcat K8E (S2865)
                1458 5004  GA-K8N Ultra-9 Mainboard
                1462 7100  MSI K8N Diamond
+               1462 7125  K8N Neo4-F mainboard
                147b 1c1a  KN8-Ultra Mainboard
                1565 3402  NF4 AM2L Mainboard
        005c  CK804 PCI Bridge
@@ -5712,7 +5768,8 @@
                10f1 2865  Tomcat K8E (S2865)
                10f1 2891  Thunder K8SRE Mainboard
                1458 5000  GA-K8N Ultra-9 Mainboard
-               1462 7100  MSI K8N Diamond
+               1462 7100  K8N Diamond Mainboard
+               1462 7125  K8N Neo4-F Mainboard
                147b 1c1a  KN8-Ultra Mainboard
                1565 3402  NF4 AM2L Mainboard
        005f  CK804 Memory Controller
@@ -6112,6 +6169,7 @@
        0259  NV25GL [Quadro4 750 XGL]
        025b  NV25GL [Quadro4 700 XGL]
        0260  MCP51 LPC Bridge
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81bc  A8N-VM CSM Mainboard
                1458 5001  GA-M55plus-S3G
@@ -6121,25 +6179,30 @@
        0262  MCP51 LPC Bridge
        0263  MCP51 LPC Bridge
        0264  MCP51 SMBus
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81bc  A8N-VM CSM Mainboard
                105b 0cad  Winfast 6100K8MB
                1462 7207  K8NGM2 series
        0265  MCP51 IDE
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81bc  A8N-VM CSM Mainboard
                1462 7207  K8NGM2 series
 # Foxconn has used a wrong vendor ID for this one
                f05b 0cad  Winfast 6100K8MB
        0266  MCP51 Serial ATA Controller
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81bc  A8N-VM CSM Mainboard
                1462 7207  K8NGM2 series
        0267  MCP51 Serial ATA Controller
+               103c 2a34  Pavilion a1677c
                1043 81bc  A8N-VM CSM Mainboard
                1462 7207  K8NGM2 series
        0268  MCP51 Ethernet Controller
        0269  MCP51 Ethernet Controller
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 8141  A8N-VM CSM Mainboard
                1462 7207  K8NGM2 series
@@ -6147,16 +6210,19 @@
        026b  MCP51 AC97 Audio Controller
                105b 0cad  Winfast 6100K8MB
        026c  MCP51 High Definition Audio
+               103c 2a34  Pavilion a1677c
                103c 30b5  Presario V3242AU
                103c 30b7  Presario V6133CL
                10de cb84  ASUSTeK Computer Inc. A8N-VM CSM Mainboard
                1462 7207  K8NGM2 series
        026d  MCP51 USB Controller
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81bc  A8N-VM CSM Mainboard
                105b 0cad  Winfast 6100K8MB
                1462 7207  K8NGM2 series
        026e  MCP51 USB Controller
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81bc  A8N-VM CSM Mainboard
                105b 0cad  Winfast 6100K8MB
@@ -6164,6 +6230,7 @@
        026f  MCP51 PCI Bridge
                103c 30b7  Presario V6133CL
        0270  MCP51 Host Bridge
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81bc  A8N-VM CSM Mainboard
                105b 0cad  Winfast 6100K8MB
@@ -6173,13 +6240,16 @@
                103c 30b5  Presario V3242AU
                103c 30b7  Presario V6133CL
        0272  MCP51 Memory Controller 0
+               103c 2a34  Pavilion a1677c
                105b 0cad  Winfast 6100K8MB
        027e  C51 Memory Controller 2
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81cd  A8N-VM CSM Mainboard
                1458 5000  GA-M55plus-S3G
                1462 7207  K8NGM2 series
        027f  C51 Memory Controller 3
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81cd  A8N-VM CSM Mainboard
                1458 5000  GA-M55plus-S3G
@@ -6224,6 +6294,7 @@
        02e4  G71 [GeForce 7950 GT]
                1682 2271  PV-T71A-YDF7 (512MB)
        02f0  C51 Host Bridge
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81cd  A8N-VM CSM Mainboard
                1462 7207  K8NGM2 series
@@ -6236,6 +6307,7 @@
        02f6  C51 Host Bridge
        02f7  C51 Host Bridge
        02f8  C51 Memory Controller 5
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81cd  A8N-VM CSM Mainboard
                1458 5000  GA-M55plus-S3G
@@ -6246,6 +6318,7 @@
                1458 5000  GA-M55plus-S3G
                1462 7207  K8NGM2 series
        02fa  C51 Memory Controller 0
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81cd  A8N-VM CSM Mainboard
                1458 5000  GA-M55plus-S3G
@@ -6256,11 +6329,13 @@
        02fd  C51 PCI Express Bridge
                103c 30b7  Presario V6133CL
        02fe  C51 Memory Controller 1
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81cd  A8N-VM CSM Mainboard
                1458 5000  GA-M55plus-S3G
                1462 7207  K8NGM2 series
        02ff  C51 Host Bridge
+               103c 2a34  Pavilion a1677c
                103c 30b7  Presario V6133CL
                1043 81cd  A8N-VM CSM Mainboard
                1458 5000  GA-M55plus-S3G
@@ -6588,7 +6663,6 @@
                1849 054c  ALiveNF7G-HDready, MCP67 Gigabit Ethernet
        054d  MCP67 Ethernet
        054e  MCP67 Ethernet
-# forcedeth source code from Nvidi
        054f  MCP67 Ethernet
        0550  MCP67 AHCI Controller
                1043 8308  M2N68-AM Motherboard
@@ -6610,10 +6684,12 @@
                1849 0562  ALiveNF7G-HDready
        0563  MCP67 PCI Express Bridge
        0568  MCP78S [GeForce 8200] Memory Controller
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 0568  K10N78FullHD-hSLI R3.0 Memory Controller
        0569  MCP78S [GeForce 8200] PCI Express Bridge
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 0569  K10N78FullHD-hSLI R3.0 PCI Express Bridge
@@ -6733,9 +6809,9 @@
        06cd  GF100 [GeForce GTX 470]
        06d1  GF100 [Tesla C2050 / C2070]
        06d2  GF100 [Tesla M2070]
-       06d8  GF100 [Quadro 6000]
-       06d9  GF100 [Quadro 5000]
-       06dd  GF100 [Quadro 4000]
+       06d8  GF100GL [Quadro 6000]
+       06d9  GF100GL [Quadro 5000]
+       06dd  GF100GL [Quadro 4000]
        06de  GF100 [Tesla S2050]
        06df  GF100 [Tesla M2070Q]
        06e0  G98 [GeForce 9300 GE]
@@ -6762,18 +6838,22 @@
        06fd  G98 [Quadro NVS 295]
        06ff  G98 [HICx16 + Graphics]
        0751  MCP78S [GeForce 8200] Memory Controller
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 0751  K10N78FullHD-hSLI R3.0 Memory Controller
        0752  MCP78S [GeForce 8200] SMBus
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 0752  K10N78FullHD-hSLI R3.0 SMBus
        0753  MCP78S [GeForce 8200] Co-Processor
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 0753  K10N78FullHD-hSLI R3.0 Co-Processor
        0754  MCP78S [GeForce 8200] Memory Controller
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 0754  K10N78FullHD-hSLI R3.0 Memory Controller
@@ -6782,18 +6862,22 @@
                1462 7508  K9N2GM-FIH
                1849 0759  K10N78FullHD-hSLI R3.0 IDE
        075a  MCP78S [GeForce 8200] PCI Bridge
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1849 075a  K10N78FullHD-hSLI R3.0 PCI Bridge
        075b  MCP78S [GeForce 8200] PCI Express Bridge
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 075b  K10N78FullHD-hSLI R3.0 PCI Express Bridge
        075c  MCP78S [GeForce 8200] LPC Bridge
+               103c 2a9e  Pavilion p6310f
                1462 7508  K9N2GM-FIH
                1849 075c  K10N78FullHD-hSLI R3.0 LPC Bridge
        075d  MCP78S [GeForce 8200] LPC Bridge
                1043 82e8  M3N72-D
        0760  MCP77 Ethernet
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 0760  K10N78FullHD-hSLI R3.0 Ethernet
@@ -6801,31 +6885,38 @@
        0762  MCP77 Ethernet
        0763  MCP77 Ethernet
        0774  MCP72XE/MCP72P/MCP78U/MCP78S High Definition Audio
+               103c 2a9e  Pavilion p6310f
 # has a Realtek ALC1200 HDAudio Codec
                1043 82fe  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 3662  K10N78FullHD-hSLI R3.0 High Definition Audio
        0778  MCP78S [GeForce 8200] PCI Express Bridge
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 0778  K10N78FullHD-hSLI R3.0 PCI Express Bridge
        077a  MCP78S [GeForce 8200] PCI Bridge
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 077a  K10N78FullHD-hSLI R3.0 PCI Bridge
        077b  MCP78S [GeForce 8200] OHCI USB 1.1 Controller
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 077b  K10N78FullHD-hSLI R3.0 OHCI USB 1.1 Controller
        077c  MCP78S [GeForce 8200] EHCI USB 2.0 Controller
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 077c  K10N78FullHD-hSLI R3.0 EHCI USB 2.0 Controller
        077d  MCP78S [GeForce 8200] OHCI USB 1.1 Controller
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 077d  K10N78FullHD-hSLI R3.0 OHCI USB 1.1 Controller
        077e  MCP78S [GeForce 8200] EHCI USB 2.0 Controller
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1462 7508  K9N2GM-FIH
                1849 077e  K10N78FullHD-hSLI R3.0 EHCI USB 2.0 Controller
@@ -6901,6 +6992,7 @@
        0845  C77 [GeForce 8200M G]
        0846  C77 [GeForce 9200]
        0847  C78 [GeForce 9100]
+               103c 2a9e  Pavilion p6310f
        0848  C77 [GeForce 8300]
        0849  C77 [GeForce 8200]
                1462 7508  K9N2GM-FIH
@@ -6972,6 +7064,7 @@
        0a73  GT218 [GeForce 305M]
        0a74  GT218 [GeForce G210M]
        0a75  GT218 [GeForce 310M]
+       0a76  GT218 [ION 2]
        0a78  GT218GL [Quadro FX 380 LP]
        0a7c  GT218 [Quadro FX 380M]
        0a80  MCP79 Host Bridge
@@ -7038,6 +7131,7 @@
                1462 7508  K9N2GM-FIH
                1849 0ad0  K10N78FullHD-hSLI R3.0 IDE
        0ad4  MCP78S [GeForce 8200] AHCI Controller
+               103c 2a9e  Pavilion p6310f
                1043 82e8  M3N72-D
                1849 0ad4  K10N78FullHD-hSLI R3.0 AHCI Controller
        0ad8  MCP78S [GeForce 8200] SATA Controller (RAID mode)
@@ -7090,55 +7184,82 @@
                1558 8687  CLEVO/KAPOK W860CU
        0dd2  GF106 [GeForce GT 445M]
        0dd8  GF106GL [Quadro 2000]
-       0dda  GF106 [Quadro 2000M]
+# NVIDIA calls it GF106GML
+       0dda  GF106GLM [Quadro 2000M]
        0de0  GF108 [GeForce GT 440]
        0de1  GF108 [GeForce GT 430]
                3842 1430  GeForce GT 430
        0de2  GF108 [GeForce GT 420]
+       0de9  GeForce GT 630M
 # Not fully sure that it's GF108, might also be GF106.
        0deb  GF108 [GeForce GT 555M]
        0dee  GF108 [GeForce GT 415M]
+       0def  GF108 [Quadro NVS 5400M]
        0df0  GF108 [GeForce GT 425M]
        0df2  GF108 [GeForce GT 435M]
        0df4  GF108 [GeForce GT 540M]
        0df5  GF108 [GeForce GT 540M]
        0df7  GF108 [GeForce GT 520M]
-       0df8  GF108 [Quadro 600]
-       0dfa  GF108 [Quadro 1000M]
-       0e08  HDMI Audio stub
+# NVIDIA calls it GL
+       0df8  GF108GL [Quadro 600]
+# NVIDIA calls it GLM
+       0df9  GF108GLM [Quadro 500M]
+# NVIDIA calls it GLM
+       0dfa  GF108GLM [Quadro 1000M]
+       0e08  GF119 HDMI Audio Controller
        0e09  GF110 High Definition Audio Controller
-       0e0a  GK104 [Geforce GTX680]
-       0e0c  GF110 High Definition Audio Controller
+       0e0a  GK104 HDMI Audio Controller
+       0e0c  GF114 HDMI Audio Controller
        0e22  GF104 [GeForce GTX 460]
                1462 2322  N460GTX Cyclone 1GD5/OC
        0e3a  GF104 [Quadro 3000M]
        0e3b  GF104 [Quadro 4000M]
+       0fd1  GK107 [GeForce GT 650M]
        0fd2  GK107 [GeForce GT 640M]
+       0ffb  GK107 [Quadro K2000M]
+       0ffc  GK107 [Quadro K1000M]
        1040  GF119 [GeForce GT 520]
        1050  GF119 [GeForce GT 520M]
        1051  GF119 [GeForce GT 520MX]
        1056  GF119 [Quadro NVS 4200M]
        1057  GF119 [Quadro NVS 4200M]
+       105a  GF119 [GeForce 610M]
        1080  GF110 [GeForce GTX 580]
        1081  GF110 [GeForce GTX 570]
                10de 087e  Leadtek WinFast GTX 570
-       1082  GF114 [GeForce GTX 560 Ti]
+       1082  GF110 [GeForce GTX 560 Ti]
        1086  GF110 [GeForce GTX 570 HD]
+       1087  GF110 [GeForce GTX 560 Ti 448 Cores]
        1091  Tesla M2090
        1094  Tesla M2075 Dual-Slot Computing Processor Module
        1096  Tesla C2075
+       109b  GF100GL [Quadro 7000]
        10c3  GT218 [GeForce 8400 GS]
                10de 066d  G98 [GeForce 8400GS]
-       10c5  Dell M116N [GeForce 405]
-       10d8  GT218 [NVS 300]
+       10c5  GT218 [GeForce 405]
+       10d8  GT218 [Quadro NVS 300]
        1180  GK104 [GeForce GTX 680]
-       1200  GF110 [GeForce GTX 560 Ti]
+       1183  GK104 [GeForce GTX 660 Ti]
+       1188  GK104 [GeForce GTX 690]
+       1189  GK104 [GeForce GTX 670]
+       11bc  GK104 [Quadro K5000M]
+       11bd  GK104 [Quadro K4000M]
+       11be  GK104 [Quadro K3000M]
+       1200  GF114 [GeForce GTX 560 Ti]
        1201  GF114 [GeForce GTX 560]
        1205  GF114 [GeForce GTX 460 v2]
        1244  GF116 [GeForce GTX 550 Ti]
        1245  GF116 [GeForce GTS 450]
        1247  GF106 [GeForce GT 555M]
 10df  Emulex Corporation
+       0720  OneConnect NIC (Skyhawk)
+       0722  OneConnect iSCSI Initiator (Skyhawk)
+       0723  OneConnect iSCSI Initiator + Target (Skyhawk)
+       0724  OneConnect FCoE Initiator (Skyhawk)
+       0728  OneConnect NIC (Skyhawk-VF)
+       072a  OneConnect iSCSI Initiator (Skyhawk-VF)
+       072b  OneConnect iSCSI Initiator + Target (Skyhawk-VF)
+       072c  OneConnect FCoE Initiator (Skyhawk-VF)
        1ae5  LP6000 Fibre Channel Host Adapter
        e100  Proteus-X: LightPulse IOV Fibre Channel Host Adapter
        e131  LightPulse 8Gb/s PCIe Shared I/O Fibre Channel Adapter
@@ -7284,6 +7405,7 @@
        0885  Realtek 885 High Definition Audio
        0888  Realtek 888 High Definition Audio
                1028 020d  Inspiron 530
+       0892  Realtek 892 High Definition Audio
        5209  RTS5209 PCI Express Card Reader
        5229  RTS5229 PCI Express Card Reader
        5288  Barossa PCI Express Card Reader
@@ -7358,6 +7480,7 @@
        8168  RTL8111/8168B PCI Express Gigabit Ethernet controller
                1019 8168  MCP73PVT-SM
                1028 04b2  Vostro 3350
+               1028 04da  Vostro 3750
                103c 1611  Pavilion DM1Z-3000
                1043 11f5  A6J-Q008
                1043 16d5  U6V/U31J laptop
@@ -7366,14 +7489,14 @@
                1043 83a3  M4A785TD Motherboard
                1043 8432  P8P67 and other motherboards
                10ec 8168  TEG-ECTX Gigabit PCI-E Adapter [Trendnet]
-               1458 e000  GA-EP45-DS5 Motherboard
+               1458 e000  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
                1462 238c  Onboard RTL8111b on MSI P965 Platinum Mainboard
                1462 368c  K9AG Neo2
                1462 7522  X58 Pro-E
                1775 11cc  CC11/CL11
                1849 8168  Motherboard (one of many)
                8086 d615  Desktop Board D510MO
-       8169  RTL-8169 Gigabit Ethernet
+       8169  RTL8169 PCI Gigabit Ethernet Controller
                1025 0079  Aspire 5024WLMi
                10bd 3202  EP-320G-TX1 32-bit PCI Gigabit Ethernet Adapter
                10ec 8169  RTL8169/8110 Family PCI Gigabit Ethernet NIC
@@ -7403,6 +7526,7 @@
        8190  RTL8190 802.11n Wireless LAN
        8191  RTL8188CE 802.11b/g/n WiFi Adapter
        8192  RTL8192E/RTL8192SE Wireless LAN Controller
+       8193  RTL8192DE Wireless LAN Controller
        8197  SmartLAN56 56K Modem
        8199  RTL8187SE Wireless LAN Controller
                1462 6894  MN54G2 / MS-6894 Wireless Mini PCIe Card
@@ -7566,6 +7690,9 @@
        0007  HPT371/371N
        0008  HPT374
        0009  HPT372N
+       0620  RocketRAID 620 2 Port SATA-III Controller
+       0622  RocketRAID 622 2 Port SATA-III Controller
+       0640  RocketRAID 640 4 Port SATA-III Controller
        1720  RocketRAID 1720 (2x SATA II RAID Controller)
        1740  RocketRAID 1740
        1742  RocketRAID 1742
@@ -7586,6 +7713,7 @@
        3120  RocketRAID 3120
        3220  RocketRAID 3220
        3320  RocketRAID 3320
+       4310  RocketRaid 4310
 1104  RasterOps Corp.
 1105  Sigma Designs, Inc.
        1105  REALmagic Xcard MPEG 1/2/3/4 DVD Decoder
@@ -7638,6 +7766,7 @@
                1043 836c  P7H55
                1043 83c7  P5KPL-AM EPU
        0409  VX855/VX875 Host Bridge: Host Control
+       0410  VX900 Host Bridge: Host Control
        0415  VT6415 PATA IDE Host Controller
                1043 838f  M5A88-V EVO
        0501  VT8501 [Apollo MVP4]
@@ -7723,6 +7852,7 @@
        1353  VX800/VX820 Error Reporting
        1364  CN896/VN896/P4M900 Host Bridge
        1409  VX855/VX875 Error Reporting
+       1410  VX900 Error Reporting
        1571  VT82C576M/VT82C586
        1595  VT82C595/97 [Apollo VP2/97]
        1732  VT1732 [Envy24 II] PCI Multi-Channel Audio Controller
@@ -7747,6 +7877,7 @@
        2353  VX800/VX820 Host Bus Control
        2364  CN896/VN896/P4M900 Host Bridge
        2409  VX855/VX875 Host Bus Control
+       2410  VX900 CPU Bus Controller
        287a  VT8251 PCI to PCI Bridge
        287b  VT8251 Host Bridge
        287c  VT8251 PCIE Root Port
@@ -7772,6 +7903,7 @@
                147b 1407  KV8-MAX3 motherboard
                182d 201d  CN-029 USB2.0 4 port PCI Card
                1849 3038  K7VT6
+               19da a179  ZBOX nano VD01
        3040  VT82C586B ACPI
        3043  VT86C100A [Rhine]
                10bd 0000  VT86C100A Fast Ethernet Adapter
@@ -7781,6 +7913,7 @@
                0010 0001  IEEE 1394 4port DCST 1394-3+1B
                1025 005a  TravelMate 290
                103c 2a20  Pavilion t3030.de Desktop PC
+               103c 2a3b  Media Center PC m7590n
                1043 808a  A8V/A8N/P4P800 series motherboard
                1043 81fe  M4A series motherboard
                1458 1000  GA-7VT600-1394 Motherboard
@@ -7884,6 +8017,7 @@
                147b 1407  KV8-MAX3 motherboard
                182d 201d  CN-029 USB 2.0 4 port PCI Card
                1849 3104  K7VT6 motherboard
+               19da a179  ZBOX nano VD01
        3106  VT6105/VT6106S [Rhine-III]
                1106 0105  VT6106S [Rhine-III]
                1186 1403  DFE-530TX rev C
@@ -7966,6 +8100,7 @@
        3282  K8T800Pro Host Bridge
        3287  VT8251 PCI to ISA Bridge
        3288  VT8237A/VT8251 HDA Controller
+               19da a179  ZBOX VD01
        3290  K8M890 Host Bridge
        3296  P4M800 Host Bridge
        3324  CX700/VX700 Host Bridge
@@ -7987,6 +8122,8 @@
                1043 8374  M5A88-V EVO
                1043 8384  P8P67 Deluxe Motherboard
        3409  VX855/VX875 DRAM Bus Control
+       3410  VX900 DRAM Bus Control
+               19da a179  ZBOX nano VD01
        4149  VIA VT6420 (ATA133) Controller
        4204  K8M800 Host Bridge
        4208  PT890 Host Bridge
@@ -8009,6 +8146,8 @@
        4364  CN896/VN896/P4M900 Host Bridge
        4397  VT1708B/1702S/1708S HD audio codec
        4409  VX855/VX875 Power Management Control
+       4410  VX900 Power Management and Chip Testing Control
+               19da a179  ZBOX nano VD01
        4428  VT1718S HD Audio Codec
        5030  VT82C596 ACPI [Apollo PRO]
        5122  VX855/VX875 Chrome 9 HCM Integrated Graphics
@@ -8026,12 +8165,15 @@
        5364  CN896/VN896/P4M900 I/O APIC Interrupt Controller
        5372  VT8237/8251 Serial ATA Controller
        5409  VX855/VX875 APIC and Central Traffic Control
+       5410  VX900 APIC and Central Traffic Control
        6100  VT85C100A [Rhine II]
        6287  SATA RAID Controller
        6327  P4M890 Security Device
        6353  VX800/VX820 Scratch Registers
        6364  CN896/VN896/P4M900 Security Device
        6409  VX855/VX875 Scratch Registers
+       6410  VX900 Scratch Registers
+               19da a179  ZBOX nano VD01
        7122  VX900 Graphics [Chrome9 HD]
        7204  K8M800 Host Bridge
        7205  KM400/KN400/P4M800 [S3 UniChrome]
@@ -8056,6 +8198,8 @@
        7353  VX800/VX820 North-South Module Interface Control
        7364  CN896/VN896/P4M900 Host Bridge
        7409  VX855/VX875 North-South Module Interface Control
+       7410  VX900 North-South Module Interface Control
+               19da a179  ZBOX nano VD01
        8231  VT8231 [PCI-to-ISA Bridge]
        8235  VT8235 ACPI
        8305  VT8363/8365 [KT133/KM133 AGP]
@@ -8064,6 +8208,8 @@
        8391  VT8371 [KX133 AGP]
        8400  MVP4
        8409  VX855/VX875 Bus Control and Power Management
+       8410  VX900 Bus Control and Power Management
+               19da a179  ZBOX VD01
        8500  KLE133/PLE133/PLE133T
        8501  VT8501 [Apollo MVP4 AGP]
        8596  VT82C596 [Apollo PRO AGP]
@@ -8078,6 +8224,7 @@
        8a26  KL133/KL133A/KM133/KM133A [S3 ProSavage]
        8d01  PN133/PN133T [S3 Twister]
        8d04  KM266/P4M266/P4M266A/P4N266 [S3 ProSavageDDR]
+       9001  VX900 Serial ATA Controller
        9530  Secure Digital Memory Card Controller
        95d0  SDIO Host Controller
        a208  PT890 PCI to PCI Bridge Controller
@@ -8099,7 +8246,7 @@
                147b 1407  KV8-MAX3 motherboard
        b198  VT8237/VX700 PCI Bridge
        b213  VPX/VPX2 I/O APIC Interrupt Controller
-       b353  VX855/VX875 PCI to PCI Bridge
+       b353  VX855/VX875/VX900 PCI to PCI Bridge
        b999  [K8T890 North / VT8237 South] PCI Bridge
        c208  PT890 PCI to PCI Bridge Controller
        c238  K8T890 PCI to PCI Bridge Controller
@@ -8428,7 +8575,6 @@
                0000 5071  Behold TV 507 RDS
                0000 507b  Behold TV 507 RDS
                0000 5201  Behold TV Columbus
-# Deleting vendor name after rereading submit instructions
                0070 6701  WinTV HVR-1110
                1019 4cb5  Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM)
                1043 0210  FlyTV mini Asus Digimatrix
@@ -8440,6 +8586,7 @@
                1131 2001  Proteus Pro [philips reference design]
                1131 2018  Tiger reference design
                1131 4ee9  MonsterTV Mobile
+               1131 7133  Pinnacle PCTV 301i
                11bd 002b  PCTV Stereo
                11bd 002e  PCTV 110i (saa7133)
                12ab 0800  PURPLE TV
@@ -8691,6 +8838,8 @@
 1134  Mercury Computer Systems
        0001  Raceway Bridge
        0002  Dual PCI to RapidIO Bridge
+       000b  POET Serial RapidIO Bridge
+       000d  POET PSDMS Device
 1135  Fuji Xerox Co Ltd
        0001  Printer controller
 1136  Momentum Data Systems
@@ -8705,10 +8854,14 @@
                1137 0047  VIC P81E PCIe Ethernet NIC
                1137 0048  VIC M81KR Mezzanine Ethernet NIC
                1137 004f  VIC 1280 Mezzanine Ethernet NIC
+               1137 0084  VIC 1240 MLOM Ethernet NIC
+               1137 0085  VIC 1225 PCIe Ethernet NIC
        0044  VIC Ethernet NIC Dynamic
                1137 0047  VIC P81E PCIe Ethernet NIC Dynamic
                1137 0048  VIC M81KR Mezzanine Ethernet NIC Dynamic
                1137 004f  VIC 1280 Mezzanine Ethernet NIC Dynamic
+               1137 0084  VIC 1240 MLOM Ethernet NIC Dynamic
+               1137 0085  VIC 1225 PCIe Ethernet NIC Dynamic
        0045  VIC FCoE HBA
                1137 0047  VIC P81E PCIe FCoE HBA
                1137 0048  VIC M81KR Mezzanine FCoE HBA
@@ -9107,7 +9260,7 @@
                1179 0001  FIR Port Type-DO
 117a  A-Trend Technology
 117b  L G Electronics, Inc.
-117c  Atto Technology
+117c  ATTO Technology, Inc.
        002c  SAS RAID Adapter
        0030  Ultra320 SCSI Host Adapter
                117c 8013  ExpressPCI UL4D
@@ -9206,6 +9359,7 @@
                1028 01d7  XPS M1210
                1028 01f3  Inspiron 1420
                1028 01f5  Dell Inspiron 1501
+               1028 024f  Dell Latitude e6500
                103c 03b5  Presario V3242AU
                103c 30b7  Presario V6133CL
                1183 0843  Alienware Aurora m9700
@@ -9218,10 +9372,16 @@
                1043 1967  V6800V
                1180 0852  Pavilion 2410us
                1324 10cf  P7120
-       e230  Memory Stick Host Controller
+       e230  R5U2xx (R5U230 / R5U231 / R5U241) [Memory Stick Host Controller]
+       e476  CardBus bridge
+               1028 040a  Latitude E6410
+               1028 040b  Latitude E6510
        e822  MMC/SD Host Controller
+               1028 040a  Latitude E6410
                1028 040b  Latitude E6510
+       e823  PCIe SDXC/MMC Host Controller
        e832  R5C832 PCIe IEEE 1394 Controller
+               1028 040a  Latitude E6410
                1028 040b  Latitude E6510
        e852  PCIe xD-Picture Card Controller
 1181  Telmatics International
@@ -9263,6 +9423,8 @@
        4000  DL2000-based Gigabit Ethernet
        4001  DGE-550SX PCI-X Gigabit Ethernet Adapter
        4300  DGE-528T Gigabit Ethernet Adapter
+# rev. B1; RealTek RTL8168E.
+               1186 4b10  DGE-560T PCI Express (x1) Gigabit Ethernet Adapter
        4302  DGE-530T Gigabit Ethernet Adapter (rev.C1) [Realtek RTL8169]
 # There are at least 3 revisions of this adapter; 4800 is board revision A1 as far as I can tell, revision B1 is 4c00.
        4800  DGE-530T Gigabit Ethernet Adapter (rev 11)
@@ -9376,6 +9538,7 @@
        2a01  88W8335 [Libertas] 802.11b/g Wireless
        2a02  88W8361 [TopDog] 802.11n Wireless
                07d1 3b02  DIR-615 rev. A1 Mini PCI Wireless Module
+               1385 7c01  WN511T RangeMax Next 300 Mbps Wireless Notebook Adapter
                1385 7e00  WN311T RangeMax Next 300 Mbps Wireless PCI Adapter
                1799 801b  F5D8011 v2 802.11n N1 Wireless Notebook Card
        2a08  88W8362e [TopDog] 802.11a/b/g/n Wireless
@@ -9547,7 +9710,7 @@
        6081  MV88SX6081 8-port SATA II PCI-X Controller
        6101  88SE6101/6102 single-port PATA133 interface
        6111  88SE6111 1-port PATA133(IDE) and 1-port SATA II Controllers
-       6121  88SE6121 SATA II Controller
+       6121  88SE6121 SATA II / PATA Controller
        6141  88SE614x SATA II PCI-E controller
        6145  88SE6145 SATA II PCI-E controller
        6180  88F6180 [Kirkwood] ARM SoC
@@ -9735,14 +9898,17 @@
        5801  USB
        5802  USS-312 USB Controller
        5803  USS-344S USB Controller
-       5811  FW322/323
+       5811  FW322/323 [TrueFire] 1394a Controller
+               103c 2a34  Pavilion a1677c
+               103c 2a9e  Pavilion p6310f
                1043 8294  IEEE 1394a Firewire Controller
                8086 524c  D865PERL mainboard
                dead 0800  FireWire Host Bus Adapter
-       5901  FW643 PCI Express 1394b Controller (PHY/Link)
+       5901  FW643 [TrueFire] PCIe 1394b Controller
+               11c1 5900  FW643 [TrueFire] PCIe 1394b Controller
                1443 0643  FireBoard800-e V.2
-               1546 0643  FWB-PCIE1X20
-       5903  FW533 PCI Express 1394a Controller (PHY/Link)
+               1546 0643  FWB-PCIE1X2x
+       5903  FW533 [TrueFire] PCIe 1394a Controller
        8110  T8110 H.100/H.110 TDM switch
                12d9 000c  E1/T1 PMXc cPCI carrier card
        ab10  WL60010 Wireless LAN MAC
@@ -10559,6 +10725,7 @@
        8212  IT8212 Dual channel ATA RAID controller
                1283 0001  IT/ITE8212 Dual channel ATA RAID controller
        8213  IT8213 IDE Controller
+               1458 b000  GA-EG45M-DS2H Mainboard
        8330  IT8330G
        8872  IT8874F PCI Dual Serial Port Controller
        8888  IT8888F/G PCI to ISA Bridge with SMB [Golden Gate]
@@ -10952,8 +11119,10 @@
        0067  PCI-DAS6070
        0068  PCI-DAS6071
        006f  PCI-DAS6036
+       0070  PCI-DAC6702
        0078  PCI-DAS6013
        0079  PCI-DAS6014
+       0115  PCIe-DAS1602/16
 1308  Jato Technologies Inc.
        0001  NetCelerator Adapter
                1308 0001  NetCelerator Adapter
@@ -11078,6 +11247,13 @@
 1343  Phylon Communications Inc
 # nee Crucial Technology
 1344  Micron Technology Inc
+       5150  RealSSD P320h
+       5151  RealSSD P320m
+       5152  RealSSD P320s
+       5153  RealSSD P325m
+       5160  RealSSD P420h
+       5161  RealSSD P420m
+       5163  RealSSD P425m
 1345  Arescom Inc
 1347  Odetics
 1349  Sumitomo Electric Industries, Ltd.
@@ -11281,6 +11457,7 @@
 1389  Applicom International
        0001  PCI1500PFB [Intelligent fieldbus adaptor]
 138a  Fusion Micromedia Corp
+       003d  VFS491 Validity Sensor
 138b  Tokimec Inc
 138c  Silicon Reality
 138d  Future Techno Designs pte Ltd
@@ -11538,6 +11715,9 @@
                153b 1144  Aureon 5.1
                153b 1170  Aureon 7.1
                1681 a000  Gamesurround MUSE XL
+               17ab 0604  PSC604 Dynamic Edge
+               17ab 0605  PSC605 Sonic Edge
+               17ab 7777  PSC605 Sonic Edge
                270f 1103  CT-7NJS Ultra motherboard
                270f f462  7NJL1 motherboard
                584d 3731  Digital X-Mystique
@@ -11571,6 +11751,9 @@
                7284 9761  CLARO
                7284 9781  CLARO halo
                7284 9783  eCLARO
+       8828  CM8828 [Oxygen Express]
+       8888  CM8888 [Oxygen Express]
+               1043 84d5  ROG Xonar Phoebus
        9880  CM9880
 13f7  Wildfire Communications
 13f8  Ad Lib Multimedia Inc
@@ -11812,6 +11995,7 @@
        9513  OX16PCI954 (Quad 16950 UART) function 1 (parallel port)
        9521  OX16PCI952 (Dual 16950 UART)
        9523  OX16PCI952 Integrated Parallel Port
+       c158  OXPCIe952 Dual 16C950 UART
        c308  EX-44016 16-port serial
 1416  Multiwave Innovation pte Ltd
 1417  Convergenet Technologies Inc
@@ -12192,7 +12376,7 @@
        8002  VScom 020L 2 port parallel adaptor
        8010  VScom 100L 1 port serial adaptor
        8011  VScom 110L 1 port serial and 1 port parallel adaptor
-       8020  VScom 200L 1 port serial adaptor
+       8020  VScom 200L 1 or 2 port serial adaptor
        8021  VScom 210L 2 port serial and 1 port parallel adaptor
        8028  VScom 200I/200I-SI 2-port serial adapter
        8040  VScom 400L 4 port serial adaptor
@@ -12281,6 +12465,9 @@
                1028 028d  PowerEdge T410 BCM5716 Gigabit Ethernet
                1028 02f1  PowerEdge R510 BCM5716 Gigabit Ethernet
        163c  NetXtreme II BCM5716S Gigabit Ethernet
+       163d  NetXtreme II BCM57811 10-Gigabit Ethernet
+       163e  NetXtreme II BCM57811 10 Gigabit Ethernet Multi Function
+       163f  NetXtreme II BCM57811 10-Gigabit Ethernet Virtual Function
        1644  NetXtreme BCM5700 Gigabit Ethernet
                1014 0277  Broadcom Vigil B5700 1000Base-T
                1028 00d1  Broadcom BCM5700
@@ -12497,6 +12684,9 @@
                1462 590c  KT6 Delta-FIS2R (MS-6590)
        169d  NetLink BCM5789 Gigabit Ethernet PCI Express
        16a0  NetLink BCM5785 Fast Ethernet
+       16a1  BCM57840 NetXtreme II 10 Gigabit Ethernet
+       16a2  BCM57840 NetXtreme II 10/20-Gigabit Ethernet
+       16a4  BCM57840 NetXtreme II Ethernet Multi Function
 # The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate.
        16a5  NetXtreme II BCM57800 1/10 Gigabit Ethernet Multi Function
                1028 1f5c  NetXtreme II BCM57800 10-Gigabit Ethernet Multi Function
@@ -12715,11 +12905,13 @@
                1737 0066  WPC600N v1 802.11a/b/g/n Wireless-N CardBus Adapter
                1737 0068  WEC600N v1 802.11a/b/g/n Wireless-N ExpressCard
        4329  BCM4321 802.11b/g/n
+               1385 7b00  WN511B RangeMax NEXT Wireless Notebook Adapter
                1385 7d00  WN311B RangeMax Next 270 Mbps Wireless PCI Adapter
                1737 0058  WPC300N v1 Wireless-N Notebook Adapter
        432a  BCM4321 802.11an Wireless Network Controller
        432b  BCM4322 802.11a/b/g/n Wireless LAN Controller
                1028 000d  Wireless 1510 Wireless-N WLAN Mini-Card
+               106b 008e  AirPort Extreme
        432c  BCM4322 802.11b/g/n
                1799 d311  Dynex DX-NNBX 802.11n WLAN Cardbus Card
        432d  BCM4322 802.11an Wireless Network Controller
@@ -12734,6 +12926,9 @@
        4358  BCM43227 802.11b/g/n
        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
+       4365  BCM43142 802.11b/g/n
+               1028 0016  Wireless 1704 802.11n + BT 4.0
        4401  BCM4401 100Base-T
                1025 0035  TravelMate 660
                103c 08b0  tc1100 tablet
@@ -13399,6 +13594,7 @@
        07c0  PVSCSI SCSI Controller
        0801  Virtual Machine Interface
                15ad 0800  Hypervisor ROM Interface
+       1977  HD Audio Controller
 15ae  Amersham Pharmacia Biotech
 15b0  Zoltrix International Ltd
 15b1  Source Technology Inc
@@ -13627,7 +13823,7 @@
                103c 1743  HP 81B 8Gbps single port FC HBA
                1657 0014  415/815 4Gbps/8Gbps single port PCIe FC HBA
        0021  804 8Gbps FC HBA for HP Bladesystem c-class
-       0022  1860 16Gbps FC HBA and/or 10Gbps CNA
+       0022  1867/1860: 16Gbps/10Gbps Fabric Adapter
                1657 0022  10Gbps CNA - FCOE
                1657 0023  10Gbps CNA - LL
                1657 0024  16Gbps FC HBA
@@ -13828,11 +14024,13 @@
                0777 4005  SR71-15 802.11an Mini PCI Adapter
                1186 3a7a  DWA-552 802.11n Xtreme N Desktop Adapter (rev A2)
        002a  AR928X Wireless Network Adapter (PCI-Express)
+               0777 4f05  SR71-X 802.11abgn Wireless ExpressCard Adapter [AR9280]
                103c 3041  AR5BHB92-H 802.11abgn Wireless Half-size Mini PCIe Card [AR9280]
                105b e006  T77H053.00 802.11bgn Wireless Mini PCIe Card [AR9281]
                105b e01f  T77H047.31 802.11bgn Wireless Half-size Mini PCIe Card [AR9283]
                11ad 6600  WN6600A 802.11bgn Wireless Mini PCIe Card [AR9281]
                144f 7141  WLL6080 802.11bgn Wireless Mini PCIe Card [AR9281]
+               168c 0203  DW1525 802.11abgn WLAN PCIe Card [AR9280]
                1a32 0303  EM303 802.11bgn Wireless Mini PCIe Card [AR9281]
                1a32 0306  EM306 802.11bgn Wireless Half-size Mini PCIe Card [AR9283]
                1a3b 1067  AW-NE771 802.11bgn Wireless Mini PCIe Card [AR9281]
@@ -13854,10 +14052,11 @@
        002d  AR9227 Wireless Network Adapter
        002e  AR9287 Wireless Network Adapter (PCI-Express)
        0030  AR9300 Wireless LAN adaptor
-               103c 1627  HB112AGN 802.11abgn 3x3 Wi-Fi Adapter
+               103c 1627  AR9380/HB112 802.11abgn 3×3 Wi-Fi Adapter
                1a56 2000  Killer Wireless-N 1102 Half-size Mini PCIe Card [AR9382]
                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
        0033  AR9580 Wireless Network Adapter
        0034  AR9462 Wireless Network Adapter
        0207  AR5210 Wireless Network Adapter [AR5000 802.11a]
@@ -13894,7 +14093,19 @@
 16c9  EONIC B.V. The Netherlands
 16ca  CENATEK Inc
        0001  Rocket Drive DL
-16cd  Densitron Technologies
+# nee Innocore Gaming Ltd., nee Densitron Gaming Ltd., a division of Densitron Technologies
+16cd  Advantech Co. Ltd
+       0101  DirectPCI SRAM for DPX-11x series
+       0102  DirectPCI SRAM for DPX-S/C/E-series
+       0103  DirectPCI ROM for DPX-11x series
+       0104  DirectPCI ROM for DPX-S/C/E-series
+       0105  DirectPCI I/O for DPX-114/DPX-115
+       0106  DirectPCI I/O for DPX-116
+       0107  DirectPCI I/O for DPX-116U
+       0108  DirectPCI I/O for DPX-117
+       0109  DirectPCI I/O for DPX-112
+       010a  DirectPCI I/O for DPX-C/E-series
+       010b  DirectPCI I/O for DPX-S series
 16ce  Roland Corp.
 16d5  Acromag, Inc.
        0504  PMC-DX504 Reconfigurable FPGA with LVDS I/O
@@ -14077,7 +14288,6 @@
        8083  GL880 USB 1.1 UHCI controller
        8084  GL880 USB 2.0 EHCI controller
 17aa  Lenovo
-       20b1  ThinkPad T61p
 17ab  Phillips Components
 17af  Hightech Information System Ltd.
 17b3  Hawking Technologies
@@ -14116,6 +14326,7 @@
                17d3 1221  ARC-1221 8-Port PCI-Express to SATA RAID Controller
        1300  ARC-1300ix-16 16-Port PCI-Express to SAS Non-RAID Host Adapter
        1680  ARC-1680 8 port PCIe/PCI-X to SAS/SATA II RAID Controller
+               17d3 1212  ARC-1212 4-Port PCIe to SAS/SATA II RAID Controller
        1880  ARC-1880 8/12 port PCIe/PCI-X to SAS/SATA II RAID Controller
 # nee Neterion Inc., previously S2io Inc.
 17d5  Exar Corp.
@@ -14159,6 +14370,7 @@
        0011  EN2010 [c.Link] MoCA Network Controller (Coax, MPEG interface)
        0021  EN2210 [c.Link] MoCA Network Controller (Coax)
        0025  EN2510 [c.Link] MoCA Network Controller (Coax, PCIe interface)
+       0027  EN2710 [c.Link] MoCA 2.0 Network Controller (Coax, PCIe interface)
 17ee  Connect Components Ltd
 17f2  Albatron Corp.
 17f3  RDC Semiconductor, Inc.
@@ -14210,7 +14422,7 @@
                1814 2560  RT2500 Wireless 802.11bg
                182d 9073  WL-115 Wireless Network PCI Adapter
                185f 22a0  CN-WF513 Wireless Cardbus Adapter
-               18eb 5312  Tornado 122 IEEE 802.11g PCI Card-EU
+               18eb 5312  WL531P IEEE 802.11g PCI Card-EU
                1948 3c00  C54RC v1 Wireless 11g CardBus Adapter
                1948 3c01  C54Ri v1 Wireless 11g PCI Adapter
        0300  Wireless Adapter Canyon CN-WF511
@@ -14224,7 +14436,7 @@
                1799 700e  F5D7000 v6000 Wireless G Desktop Card
                1799 701e  F5D7010 v6000 Wireless G Notebook Card
                17f9 0012  AWLC3026T 802.11g Wireless CardBus Adapter
-               1814 2561  EW-7108PCg
+               1814 2561  EW-7108PCg/EW-7128g
        0302  RT2561/RT61 rev B 802.11g
                1186 3a71  DWA-510 Wireless G Desktop Adapter
                1186 3c08  AirPlus G DWL-G630 Wireless Cardbus Adapter (rev.E2)
@@ -14251,7 +14463,10 @@
                13bd 1057  GN-WS32L-RH Half-size Mini PCIe Card
        3091  RT3091 Wireless 802.11n 1T/2R PCIe
        3092  RT3092 Wireless 802.11n 2T/2R PCIe
-       5360  RT5360
+       3592  RT3592 Wireless 802.11an 2T/2R PCIe
+       5360  RT5360 Wireless 802.11n 1T/1R
+               1186 3c05  DWA-525 Wireless N 150 Desktop Adapter (rev.A2)
+               20f4 703a  TEW-703PI N150 Wireless PCI Adapter
        5390  RT5390 Wireless 802.11n 1T/1R PCIe
                103c 1636  U98Z077.00 Half-size Mini PCIe Card
        539f  RT5390 [802.11 b/g/n 1T1R G-band PCI Express Single Chip]
@@ -14277,6 +14492,7 @@
        08a8  MVC101 SDI
        08a9  MVC102 DVI+Audio
        08b0  MVC200-DC
+1846  Alcatel-Lucent
 1849  ASRock Incorporation
 184a  Thales Computers
        1100  MAX II cPLD
@@ -14352,7 +14568,6 @@
 18ca  XGI Technology Inc. (eXtreme Graphics Innovation)
        0020  Z7/Z9 (XG20 core)
        0021  Z9s/Z9m (XG21 core)
-# duh! Device name, not my name :)
        0027  Z11/Z11M
        0040  Volari V3XT/V5/V8
        0047  Volari 8300 (chip: XP10, codename: XG47)
@@ -14419,7 +14634,7 @@
 18f1  Spectrum GmbH
 18f4  Napatech A/S
        0031  NT20X Network Adapter
-       0051  NT20-X Capture Card
+       0051  NT20X Capture Card
        0061  NT20E Capture Card
        0064  NT20E Inline Card
        0071  NT4E Capture Card
@@ -14428,7 +14643,9 @@
        0091  NT20X Capture Card [New Rev]
        00a1  NT4E-STD Capture Card
        00a4  NT4E-STD Inline Card
-       00c5  NT20E2 Network Adapter
+       00c5  NT20E2 Network Adapter 2x10Gb
+       00d5  NT40E2-4 Network Adapter 4x10Gb
+       00e5  NT40E2-1 Network Adapter 1x40Gb
 18f6  NextIO
        1000  [Nexsis] Switch Virtual P2P PCIe Bridge
        1050  [Nexsis] Switch Virtual P2P PCI Bridge
@@ -14443,7 +14660,6 @@
        000b  Fastcom 232/8-PCI-335 Async 8-Port RS-232 Serial PCI Adapter
        000f  Fastcom FSCC
        0010  Fastcom GSCC
-# Dual Serocco
        0011  Fastcom QSSB
        0014  SuperFSCC
        0015  SuperFSCC-104
@@ -14547,6 +14763,7 @@
                1924 0304  SFE4003-A4
                1924 0500  SFE4005-A0
        c101  EF1-21022T [EtherFabric]
+192a  BiTMICRO Networks Inc.
 192e  TransDimension
 1931  Option N.V.
        000c  Qualcomm MSM6275 UMTS chip
@@ -14558,6 +14775,7 @@
        0363  AHA363-PCIe
        0364  AHA364-PCIe
        0367  AHA367-PCIe
+       0370  AHA370-PCIe
 1942  ClearSpeed Technology plc
        e511  Advance X620 accelerator card
        e521  Advance e620 accelerator card
@@ -14629,6 +14847,7 @@
        010b  P1012
        0110  P1022E
        0111  P1022
+               1c7f 5200  EB5200
        0118  P1013E
        0119  P1013
        0128  P1010
@@ -14735,6 +14954,7 @@
        890a  Virtual HBA Device
 199f  Auvitek
        8501  AU85X1 PCI REV1.1
+       8521  AU8521 TV card
 # nee ServerEngines Corp.
 19a2  Emulex Corporation
        0200  BladeEngine 10Gb PCI-E iSCSI adapter
@@ -14840,7 +15060,8 @@
                1a78 0037  FlashMAX PCIe SSD [rev 3D]
                1a78 0038  FlashMAX PCIe SSD [rev 4]
                1a78 0039  FlashMAX PCIe SSD [rev 4D]
-               1a78 0040  FlashMAX PCIe SSD [LP Z1]
+       0040  Virident FlashMAX Drive V2
+               1a78 0040  PCIe SSD [LP Z1]
 1a84  Commex Technologies
        0001  Vulcan SP HT6210 10-Gigabit Ethernet (rev 02)
 1a88  MEN Mikro Elektronik
@@ -14855,6 +15076,11 @@
 1aae  Global Velocity, Inc.
 1ab6  CalDigit, Inc.
        6201  RAID Card
+# Parallels VM virtual devices
+1ab8  Parallels, Inc.
+       4000  Virtual Machine Communication Interface
+       4005  Accelerated Virtual Video Adapter
+       4006  Memory Ballooning Controller
 1ab9  Espia Srl
 1acc  Point of View B.V
 1ad7  Spectracom Corporation
@@ -14863,6 +15089,8 @@
 1ade  Spin Master Ltd.
        1501  Swipetech barcode scanner
 1ae0  Google, Inc.
+1ae7  First Wise Media GmbH
+       0520  HFC-S PCI A [X-TENSIONS XC-520]
 1ae8  Silicon Software GmbH
        0a40  microEnable IV-BASE x1
        0a41  microEnable IV-FULL x1
@@ -14894,6 +15122,7 @@
 1afa  J & W Electronics Co., Ltd.
 1b03  Magnum Semiconductor, Inc,
        6100  DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
+1b08  MSC Vertriebs GmbH
 1b13  Jaton Corp
 1b1a  K&F Computing Research Co.
        0e70  GRAPE
@@ -14917,6 +15146,7 @@
        0601  NumaChip N601
        0602  NumaChip N602
 1b4b  Marvell Technology Group Ltd.
+       0640  88SE9128 SATA III 6Gb/s RAID Controller
        9120  88SE9120 SATA 6Gb/s Controller
        9123  88SE9123 PCIe SATA 6.0 Gb/s controller
        9125  88SE9125 PCIe SATA 6.0 Gb/s controller
@@ -14924,16 +15154,29 @@
        9130  88SE9128 PCIe SATA 6 Gb/s RAID controller with HyperDuo
                1043 8438  P8P67 Deluxe Motherboard
        9172  88SE9172 SATA 6Gb/s Controller
+       917a  88SE9172 SATA III 6Gb/s RAID Controller
+       9192  88SE9172 SATA III 6Gb/s RAID Controller
        91a0  88SE91A0 SATA 6Gb/s Controller
-       91a4  88SE91A4 SATA 6Gb/s Controller
+       91a4  88SE9128 IDE Controller
        9480  88SE9480 SAS/SATA 6Gb/s RAID controller
 1b55  NetUP Inc.
        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
 1b6f  Etron Technology, Inc.
        7023  EJ168 USB 3.0 Host Controller
 1b73  Fresco Logic
        1000  FL1000G USB 3.0 Host Controller
+               1d5c 1000  Anker USB 3.0 Express Card
+1b74  OpenVox Communication Co. Ltd.
+       0115  D115P/D115E Single-port E1/T1 card
+       d130  D130P/D130E Single-port E1/T1 card (3rd GEN)
+       d210  D210P/D210E Dual-port E1/T1 card(2nd generation)
+       d230  D230 Dual-port E1/T1 card (2nd generation)
+       d410  D410/430 Quad-port E1/T1 card
+       d430  D410/430 Quad-port E1/T1 card
 1b85  OCZ Technology Group, Inc.
        1041  RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller)
 1b96  Western Digital
@@ -14958,10 +15201,16 @@
 1c2c  Fiberblaze
 # Used on V120 VME Crate Controller
 1c32  Highland Technology, Inc.
+1c3b  Accensus, LLC
+       0200  Telas2
 1c44  Enmotus Inc
        8000  8000 Storage IO Controller
+1c7f  Elektrobit Austria GmbH
+       5100  EB5100
+1c8a  TSF5 Corporation
 1d44  DPT
        a400  PM2x24/PM3224
+1d5c  Fantasia Trading LLC
 1de1  Tekram Technology Co.,Ltd.
        0391  TRM-S1040
        2020  DC-390
@@ -15010,6 +15259,7 @@
 2003  Smart Link Ltd.
        8800  LM-I56N
 2004  Smart Link Ltd.
+20f4  TRENDnet
 2116  ZyDAS Technology Corp.
 21c3  21st Century Computer Corp.
 # (Probably only the Mobile Phone Division)
@@ -15489,8 +15739,6 @@
                1092 5a55  Viper II Z200
                1092 5a57  Viper II Z200
        ca00  SonicVibes
-53c1  SC1-ALLEGRO
-       0cd1  CD1-OPERA
 5431  AuzenTech, Inc.
 544c  Teralogic Inc
        0350  TL880-based HDTV/ATSC tuner
@@ -15631,10 +15879,14 @@
                1043 844d  P8P67 Deluxe Motherboard
        0101  Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port
                1028 04b2  Vostro 3350
+               106b 00dc  MacBookPro8,2 [Core i7, 15", 2011]
        0102  2nd Generation Core Processor Family Integrated Graphics Controller
        0104  2nd Generation Core Processor Family DRAM Controller
                1028 04b2  Vostro 3350
+               1028 04da  Vostro 3750
+               106b 00dc  MacBookPro8,2 [Core i7, 15", 2011]
        0105  Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port
+               106b 00dc  MacBookPro8,2 [Core i7, 15", 2011]
        0106  2nd Generation Core Processor Family Integrated Graphics Controller
        0108  Xeon E3-1200 Processor Family DRAM Controller
        0109  Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port
@@ -15645,26 +15897,27 @@
        010e  Xeon E3-1200/2nd Generation Core Processor Family Integrated Graphics Controller
        0112  2nd Generation Core Processor Family Integrated Graphics Controller
        0116  2nd Generation Core Processor Family Integrated Graphics Controller
+               1028 04da  Vostro 3750
        0122  2nd Generation Core Processor Family Integrated Graphics Controller
        0126  2nd Generation Core Processor Family Integrated Graphics Controller
                1028 04cc  Vostro 3350
-       0150  Ivy Bridge DRAM Controller
-       0151  Ivy Bridge PCI Express Root Port
-       0152  Ivy Bridge Graphics Controller
-       0154  Ivy Bridge DRAM Controller
-       0155  Ivy Bridge PCI Express Root Port
-       0156  Ivy Bridge Graphics Controller
-       0158  Ivy Bridge DRAM Controller
-       0159  Ivy Bridge PCI Express Root Port
-       015a  Ivy Bridge Graphics Controller
-       015c  Ivy Bridge DRAM Controller
-       015d  Ivy Bridge PCI Express Root Port
-       015e  Ivy Bridge Graphics Controller
-       0162  Ivy Bridge Graphics Controller
-       0166  Ivy Bridge Graphics Controller
-       016a  Ivy Bridge Graphics Controller
-       0172  Ivy Bridge Graphics Controller
-       0176  Ivy Bridge Graphics Controller
+       0150  Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller
+       0151  Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port
+       0152  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
+       0154  3rd Gen Core processor DRAM Controller
+       0155  Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port
+       0156  3rd Gen Core processor Graphics Controller
+       0158  Xeon E3-1200 v2/Ivy Bridge DRAM Controller
+       0159  Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port
+       015a  Xeon E3-1200 v2/Ivy Bridge Graphics Controller
+       015c  Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller
+       015d  Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port
+       015e  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
+       0162  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
+       0166  3rd Gen Core processor Graphics Controller
+       016a  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
+       0172  Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller
+       0176  3rd Gen Core processor Graphics Controller
        0309  80303 I/O Processor PCI-to-PCI Bridge
        030d  80312 I/O Companion Chip PCI-to-PCI Bridge
        0326  6700/6702PXH I/OxAPIC Interrupt Controller A
@@ -15688,12 +15941,12 @@
        0372  80333 Segment-B PCI Express-to-PCI Express Bridge
        0373  80333 B-Bus IOAPIC
        0374  80333 Address Translation Unit
-       0402  Haswell Integrated Graphics Controller
-       0406  Haswell Integrated Graphics Controller
-       040a  Haswell Integrated Graphics Controller
-       0412  Haswell Integrated Graphics Controller
-       0416  Haswell Integrated Graphics Controller
-       041a  Haswell Integrated Graphics Controller
+       0402  Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller
+       0406  4th Gen Core Processor Integrated Graphics Controller
+       040a  Xeon E3-1200 v3 Processor Integrated Graphics Controller
+       0412  Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller
+       0416  4th Gen Core Processor Integrated Graphics Controller
+       041a  Xeon E3-1200 v3 Processor Integrated Graphics Controller
        0436  DH89xxCC Gigabit SGMII Connection
        0438  DH8900CC Series Gigabit Network Connection
        043a  DH8900CC Series Gigabit Fiber Network Connection
@@ -15817,6 +16070,12 @@
        0960  80960RP (i960RP) Microprocessor/Bridge
        0962  80960RM (i960RM) Bridge
        0964  80960RP (i960RP) Microprocessor/Bridge
+       0a04  Haswell-ULT DRAM Controller
+       0a06  Haswell-ULT Integrated Graphics Controller
+       0a16  Haswell-ULT Integrated Graphics Controller
+       0a22  Haswell-ULT Integrated Graphics Controller
+       0a26  Haswell-ULT Integrated Graphics Controller
+       0a2a  Haswell-ULT Integrated Graphics Controller
        0be0  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
        0be1  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
        0be2  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
@@ -15841,13 +16100,13 @@
        0bf5  Atom Processor D2xxx/N2xxx DRAM Controller
        0bf6  Atom Processor D2xxx/N2xxx DRAM Controller
        0bf7  Atom Processor D2xxx/N2xxx DRAM Controller
-       0c00  Haswell DRAM Controller
-       0c01  Haswell PCI Express x16 Controller
-       0c04  Haswell DRAM Controller
-       0c05  Haswell PCI Express x8 Controller
-       0c08  Haswell DRAM Controller
-       0c09  Haswell PCI Express x4 Controller
-       0c0c  Haswell HD Audio Controller
+       0c00  4th Gen Core Processor DRAM Controller
+       0c01  Xeon E3-1200 v3/4th Gen Core Processor PCI Express x16 Controller
+       0c04  Xeon E3-1200 v3/4th Gen Core Processor DRAM Controller
+       0c05  Xeon E3-1200 v3/4th Gen Core Processor PCI Express x8 Controller
+       0c08  Xeon E3-1200 v3 Processor DRAM Controller
+       0c09  Xeon E3-1200 v3/4th Gen Core Processor PCI Express x4 Controller
+       0c0c  Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller
        0c46  Centerton PCI Express Root Port 1
        0c47  Centerton PCI Express Root Port 2
        0c48  Centerton PCI Express Root Port 3
@@ -15874,6 +16133,197 @@
        0c7d  Centerton Internal Fabric
        0c7e  Centerton Internal Fabric
        0c7f  Centerton Internal Fabric
+       0e00  Ivytown DMI2
+       0e01  Ivytown PCI Express Root Port in DMI2 Mode
+       0e04  Ivytown PCI Express Root Port 2a
+       0e05  Ivytown PCI Express Root Port 2b
+       0e06  Ivytown PCI Express Root Port 2c
+       0e07  Ivytown PCI Express Root Port 2d
+       0e08  Ivytown PCI Express Root Port 3a
+       0e09  Ivytown PCI Express Root Port 3b
+       0e0a  Ivytown PCI Express Root Port 3c
+       0e0b  Ivytown PCI Express Root Port 3d
+       0e1c  Ivytown Debug and Error Injection Related Registers
+       0e1d  Ivytown R2PCIe
+       0e1e  Ivytown Semaphore and Scratchpad Configuration Registers
+       0e1f  Ivytown Semaphore and Scratchpad Configuration Registers
+       0e20  Ivytown Crystal Beach DMA Channel 0
+       0e21  Ivytown Crystal Beach DMA Channel 1
+       0e22  Ivytown Crystal Beach DMA Channel 2
+       0e23  Ivytown Crystal Beach DMA Channel 3
+       0e24  Ivytown Crystal Beach DMA Channel 4
+       0e25  Ivytown Crystal Beach DMA Channel 5
+       0e26  Ivytown Crystal Beach DMA Channel 6
+       0e27  Ivytown Crystal Beach DMA Channel 7
+       0e28  Ivytown VTd/Memory Map/Misc
+       0e29  Ivytown Memory Hotplug
+       0e2a  Ivytown IIO RAS
+       0e2c  Ivytown IOAPIC
+       0e2e  Ivytown CBDMA
+       0e2f  Ivytown CBDMA
+       0e30  Ivytown Home Agent 0
+       0e32  Ivytown QPI Link 0
+       0e33  Ivytown QPI Link 1
+       0e34  Ivytown PCI Express Ring Performance Monitoring
+       0e36  Ivytown QPI Ring Performance Ring Monitoring
+       0e37  Ivytown QPI Ring Performance Ring Monitoring
+       0e38  Ivytown Home Agent 1
+       0e3a  Ivytown QPI Link 2
+       0e3e  Ivytown QPI Ring Performance Ring Monitoring
+       0e3f  Ivytown QPI Ring Performance Ring Monitoring
+       0e40  Ivytown QPI Link 2
+       0e41  Ivytown QPI Ring Registers
+       0e43  Ivytown QPI Link Reut 2
+       0e44  Ivytown QPI Link Reut 2
+       0e60  Ivytown Home Agent 1
+       0e68  Ivytown Integrated Memory Controller 1 Target Address/Thermal Registers
+       0e6a  Ivytown Integrated Memory Controller 1 Channel Target Address Decoder Registers
+       0e6b  Ivytown Integrated Memory Controller 1 Channel Target Address Decoder Registers
+       0e6c  Ivytown Integrated Memory Controller 1 Channel Target Address Decoder Registers
+       0e6d  Ivytown Integrated Memory Controller 1 Channel Target Address Decoder Registers
+       0e71  Ivytown Integrated Memory Controller 0 RAS Registers
+       0e79  Ivytown Integrated Memory Controller 1 RAS Registers
+       0e80  Ivytown QPI Link 0
+       0e81  Ivytown QPI Ring Registers
+       0e83  Ivytown QPI Link Reut 0
+       0e84  Ivytown QPI Link Reut 0
+       0e90  Ivytown QPI Link 1
+       0e93  Ivytown QPI Link 1
+       0e94  Ivytown QPI Link Reut 1
+       0ea0  Ivytown Home Agent 0
+       0ea8  Ivytown Integrated Memory Controller 0 Target Address/Thermal Registers
+       0eaa  Ivytown Integrated Memory Controller 0 Channel Target Address Decoder Registers
+       0eab  Ivytown Integrated Memory Controller 0 Channel Target Address Decoder Registers
+       0eac  Ivytown Integrated Memory Controller 0 Channel Target Address Decoder Registers
+       0ead  Ivytown Integrated Memory Controller 0 Channel Target Address Decoder Registers
+       0eb0  Ivytown Integrated Memory Controller 1 Channel 0-3 Thermal Control 0
+       0eb1  Ivytown Integrated Memory Controller 1 Channel 0-3 Thermal Control 1
+       0eb2  Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 0
+       0eb3  Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 1
+       0eb4  Ivytown Integrated Memory Controller 1 Channel 0-3 Thermal Control 2
+       0eb5  Ivytown Integrated Memory Controller 1 Channel 0-3 Thermal Control 3
+       0eb7  Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 2
+       0ec0  Ivytown Power Control Unit 0
+       0ec1  Ivytown Power Control Unit 1
+       0ec2  Ivytown Power Control Unit 2
+       0ec3  Ivytown Power Control Unit 3
+       0ec4  Ivytown Power Control Unit 4
+       0ec8  Ivytown System Address Decoder
+       0ec9  Ivytown Broadcast Registers
+       0eca  Ivytown Broadcast Registers
+       0ed8  Ivytown DDRIO
+       0ed9  Ivytown DDRIO
+       0edc  Ivytown DDRIO
+       0edd  Ivytown DDRIO
+       0ede  Ivytown DDRIO
+       0edf  Ivytown DDRIO
+       0ee0  Ivytown Unicast Registers
+       0ee1  Ivytown Unicast Registers
+       0ee2  Ivytown Unicast Registers
+       0ee3  Ivytown Unicast Registers
+       0ee4  Ivytown Unicast Registers
+       0ee5  Ivytown Unicast Registers
+       0ee6  Ivytown Unicast Registers
+       0ee7  Ivytown Unicast Registers
+       0ee8  Ivytown Unicast Registers
+       0ee9  Ivytown Unicast Registers
+       0eea  Ivytown Unicast Registers
+       0eeb  Ivytown Unicast Registers
+       0eec  Ivytown Unicast Registers
+       0eed  Ivytown Unicast Registers
+       0eee  Ivytown Unicast Registers
+       0ef0  Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 0
+       0ef1  Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 1
+       0ef2  Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 0
+       0ef3  Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 2
+       0ef4  Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 2
+       0ef5  Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 3
+       0ef7  Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 3
+       0ef8  Ivytown DDRIO
+       0ef9  Ivytown DDRIO
+       0efa  Ivytown DDRIO
+       0efb  Ivytown DDRIO
+       0efc  Ivytown DDRIO
+       0efd  Ivytown 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
        1000  82542 Gigabit Ethernet Controller (Fiber)
                0e11 b0df  NC6132 Gigabit Ethernet Adapter (1000-SX)
                0e11 b0e0  NC6133 Gigabit Ethernet Adapter (1000-LX)
@@ -16244,6 +16694,7 @@
                103c 323f  NC362i Integrated Dual port Gigabit Server Adapter
                10a9 8028  UV-BaseIO dual-port GbE
                13a3 0037  DS4100 Secure Multi-Gigabit Server Adapter with Compression
+               15d9 a811  H8DGU
                8086 a01c  Gigabit ET Dual Port Server Adapter
                8086 a03c  Gigabit ET Dual Port Server Adapter
                8086 a04c  Gigabit ET Dual Port Server Adapter
@@ -16288,6 +16739,7 @@
                8086 a02b  Gigabit ET Quad Port Server Adapter
                8086 a02c  Gigabit ET Quad Port Server Adapter
        10ea  82577LM Gigabit Network Connection
+               1028 040a  Latitude E6410
                1028 040b  Latitude E6510
                e4bf 50c1  PC1-GROOVE
        10eb  82577LC Gigabit Network Connection
@@ -16296,6 +16748,7 @@
                8086 a11f  10-Gigabit CX4 Dual Port Server Adapter
        10ed  82599 Ethernet Controller Virtual Function
        10ef  82578DM Gigabit Network Connection
+               1028 02da  OptiPlex 980
        10f0  82578DC Gigabit Network Connection
        10f1  82598EB 10-Gigabit AF Dual Port Network Connection
                8086 a20f  10-Gigabit AF DA Dual Port Server Adapter
@@ -16618,8 +17071,10 @@
                8086 0001  Ethernet Server Adapter I340-F4
                8086 0002  Ethernet Server Adapter I340-F4
        1528  Ethernet Controller 10-Gigabit X540-AT2
+               103c 192d  561FLR-T 2-port 10Gb Ethernet Adapter
                108e 7b14  Sun Dual Port 10 GbE PCIe 2.0 ExpressModule, Base-T
                108e 7b15  Sun Dual Port 10 GbE PCIe 2.0 Low Profile Adapter, Base-T
+               1137 00bf  Ethernet Converged Network Adapter X540-T2
                8086 0001  Ethernet Converged Network Adapter X540-T2
                8086 0002  Ethernet Converged Network Adapter X540-T1
                8086 001a  Ethernet Converged Network Adapter X540-T2
@@ -16628,6 +17083,10 @@
                8086 5003  Ethernet 10G 2P X540-t Adapter
        1529  82599 10 Gigabit Dual Port Backplane Connection with FCoE
        152a  82599 10 Gigabit Dual port Network Connection with FCoE
+       153a  Ethernet Connection I217-LM
+       153b  Ethernet Connection I217-V
+       1547  DSL3510 Thunderbolt Port [Cactus Ridge]
+       1549  DSL3510 Thunderbolt Controller [Cactus Ridge]
        154a  Ethernet Server Adapter X520-4
                8086 011a  Ethernet Converged Network Adapter X520-4
                8086 011b  Ethernet Converged Network Adapter X520-4
@@ -16684,45 +17143,66 @@
                1043 844d  P8P67 Deluxe Motherboard
        1c03  6 Series/C200 Series Chipset Family 6 port SATA AHCI Controller
                1028 04b2  Vostro 3350
+               1028 04da  Vostro 3750
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c04  6 Series/C200 Series Chipset Family 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
        1c10  6 Series/C200 Series Chipset Family PCI Express Root Port 1
+               1028 04da  Vostro 3750
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c12  6 Series/C200 Series Chipset Family PCI Express Root Port 2
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c14  6 Series/C200 Series Chipset Family PCI Express Root Port 3
+               1028 04da  Vostro 3750
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c16  6 Series/C200 Series Chipset Family PCI Express Root Port 4
        1c18  6 Series/C200 Series Chipset Family PCI Express Root Port 5
+               1028 04da  Vostro 3750
        1c1a  6 Series/C200 Series Chipset Family PCI Express Root Port 6
+               1028 04da  Vostro 3750
        1c1c  6 Series/C200 Series Chipset Family PCI Express Root Port 7
        1c1e  6 Series/C200 Series Chipset Family PCI Express Root Port 8
        1c20  6 Series/C200 Series Chipset Family High Definition Audio Controller
                1028 0490  Alienware M17x R3
                1028 04aa  XPS 8300
                1028 04b2  Vostro 3350
+               1028 04da  Vostro 3750
                1043 8418  P8P67 Deluxe Motherboard
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c22  6 Series/C200 Series Chipset Family SMBus Controller
                1028 04aa  XPS 8300
                1028 04b2  Vostro 3350
+               1028 04da  Vostro 3750
                1043 844d  P8P67 Deluxe Motherboard
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c24  6 Series/C200 Series Chipset Family Thermal Management Controller
        1c25  6 Series/C200 Series Chipset Family DMI to PCI Bridge
        1c26  6 Series/C200 Series Chipset Family USB Enhanced Host Controller #1
                1028 04aa  XPS 8300
                1028 04b2  Vostro 3350
+               1028 04da  Vostro 3750
                1043 844d  P8P67 Deluxe Motherboard
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c27  6 Series/C200 Series Chipset Family USB Universal Host Controller #1
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c2c  6 Series/C200 Series Chipset Family USB Universal Host Controller #5
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c2d  6 Series/C200 Series Chipset Family USB Enhanced Host Controller #2
                1028 04aa  XPS 8300
                1028 04b2  Vostro 3350
+               1028 04da  Vostro 3750
                1043 844d  P8P67 Deluxe Motherboard
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c33  6 Series/C200 Series Chipset Family LAN Controller
        1c35  6 Series/C200 Series Chipset Family VECI Controller
        1c3a  6 Series/C200 Series Chipset Family MEI Controller #1
                1028 04aa  XPS 8300
                1028 04b2  Vostro 3350
+               1028 04da  Vostro 3750
                1043 844d  P8P67 Deluxe Motherboard
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c3b  6 Series/C200 Series Chipset Family MEI Controller #2
        1c3c  6 Series/C200 Series Chipset Family IDE-r Controller
        1c3d  6 Series/C200 Series Chipset Family KT Controller
@@ -16737,10 +17217,12 @@
        1c47  UM67 Express Chipset Family LPC Controller
        1c48  6 Series/C200 Series Chipset Family LPC Controller
        1c49  HM65 Express Chipset Family LPC Controller
+               8086 7270  Apple MacBookPro8,2 [Core i7, 15", 2011]
        1c4a  H67 Express Chipset Family LPC Controller
                1028 04aa  XPS 8300
        1c4b  HM67 Express Chipset Family LPC Controller
                1028 04b2  Vostro 3350
+               1028 04da  Vostro 3750
        1c4c  Q65 Express Chipset Family LPC Controller
        1c4d  QS67 Express Chipset Family LPC Controller
        1c4e  Q67 Express Chipset Family LPC Controller
@@ -16825,69 +17307,68 @@
        1d72  C608 chipset SMBus Controller 2
        1d74  C608/C606/X79 series chipset PCI Express Upstream Port
        1d76  C600/X79 series chipset Multi-Function Glue
-       1e00  Panther Point 4 port SATA Controller [IDE mode]
-       1e01  Panther Point 4 port SATA Controller [IDE mode]
-       1e02  Panther Point 6 port SATA Controller [AHCI mode]
-       1e03  Panther Point 6 port SATA Controller [AHCI mode]
-       1e04  Panther Point SATA Controller [RAID mode]
-       1e05  Panther Point SATA Controller [RAID mode]
-       1e06  Panther Point SATA Controller [Premium RAID mode]
-       1e07  Panther Point SATA Controller [Premium RAID mode]
-       1e08  Panther Point 2 port SATA Controller [IDE mode]
-       1e09  Panther Point 2 port SATA Controller [IDE mode]
-       1e0e  Panther Point SATA Controller [RAID mode]
-       1e10  Panther Point PCI Express Root Port 1
-       1e12  Panther Point PCI Express Root Port 2
-       1e14  Panther Point PCI Express Root Port 3
-       1e16  Panther Point PCI Express Root Port 4
-       1e18  Panther Point PCI Express Root Port 5
-       1e1a  Panther Point PCI Express Root Port 6
-       1e1c  Panther Point PCI Express Root Port 7
-       1e1e  Panther Point PCI Express Root Port 8
-       1e20  Panther Point High Definition Audio Controller
-       1e22  Panther Point SMBus Controller
-       1e24  Panther Point Thermal Management Controller
-       1e25  Panther Point DMI to PCI Bridge
-       1e26  Panther Point USB Enhanced Host Controller #1
-       1e2d  Panther Point USB Enhanced Host Controller #2
-       1e31  Panther Point USB xHCI Host Controller
-       1e33  Panther Point LAN Controller
-       1e3a  Panther Point MEI Controller #1
-       1e3b  Panther Point MEI Controller #2
-       1e3c  Panther Point IDE-r Controller
-       1e3d  Panther Point KT Controller
-       1e40  Panther Point LPC Controller
-       1e41  Panther Point LPC Controller
-       1e42  Panther Point LPC Controller
-       1e43  Panther Point LPC Controller
-       1e44  Panther Point LPC Controller
-       1e45  Panther Point LPC Controller
-       1e46  Panther Point LPC Controller
-       1e47  Panther Point LPC Controller
-       1e48  Panther Point LPC Controller
-       1e49  Panther Point LPC Controller
-       1e4a  Panther Point LPC Controller
-       1e4b  Panther Point LPC Controller
-       1e4c  Panther Point LPC Controller
-       1e4d  Panther Point LPC Controller
-       1e4e  Panther Point LPC Controller
-       1e4f  Panther Point LPC Controller
-       1e50  Panther Point LPC Controller
-       1e51  Panther Point LPC Controller
-       1e52  Panther Point LPC Controller
-       1e53  Panther Point LPC Controller
-       1e54  Panther Point LPC Controller
-       1e55  Panther Point LPC Controller
-       1e56  Panther Point LPC Controller
-       1e57  Panther Point LPC Controller
-       1e58  Panther Point LPC Controller
-       1e59  Panther Point LPC Controller
-       1e5a  Panther Point LPC Controller
-       1e5b  Panther Point LPC Controller
-       1e5c  Panther Point LPC Controller
-       1e5d  Panther Point LPC Controller
-       1e5e  Panther Point LPC Controller
-       1e5f  Panther Point LPC Controller
+       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]
+       1e03  7 Series Chipset Family 6-port SATA Controller [AHCI mode]
+       1e04  7 Series/C210 Series Chipset Family SATA Controller [RAID mode]
+       1e05  7 Series Chipset SATA Controller [RAID mode]
+       1e06  7 Series/C210 Series Chipset Family SATA Controller [RAID mode]
+       1e07  7 Series Chipset Family SATA Controller [RAID mode]
+       1e08  7 Series/C210 Series Chipset Family 2-port SATA Controller [IDE mode]
+       1e09  7 Series Chipset Family 2-port SATA Controller [IDE mode]
+       1e0e  7 Series/C210 Series Chipset Family SATA Controller [RAID mode]
+       1e10  7 Series/C210 Series Chipset Family PCI Express Root Port 1
+       1e12  7 Series/C210 Series Chipset Family PCI Express Root Port 2
+       1e14  7 Series/C210 Series Chipset Family PCI Express Root Port 3
+       1e16  7 Series/C210 Series Chipset Family PCI Express Root Port 4
+       1e18  7 Series/C210 Series Chipset Family PCI Express Root Port 5
+       1e1a  7 Series/C210 Series Chipset Family PCI Express Root Port 6
+       1e1c  7 Series/C210 Series Chipset Family PCI Express Root Port 7
+       1e1e  7 Series/C210 Series Chipset Family PCI Express Root Port 8
+       1e20  7 Series/C210 Series Chipset Family High Definition Audio Controller
+       1e22  7 Series/C210 Series Chipset Family SMBus Controller
+       1e24  7 Series/C210 Series Chipset Family Thermal Management Controller
+       1e25  7 Series/C210 Series Chipset Family DMI to PCI Bridge
+       1e26  7 Series/C210 Series Chipset Family USB Enhanced Host Controller #1
+       1e2d  7 Series/C210 Series Chipset Family USB Enhanced Host Controller #2
+       1e31  7 Series/C210 Series Chipset Family USB xHCI Host Controller
+       1e33  7 Series/C210 Series Chipset Family LAN Controller
+       1e3a  7 Series/C210 Series Chipset Family MEI Controller #1
+       1e3b  7 Series/C210 Series Chipset Family MEI Controller #2
+       1e3c  7 Series/C210 Series Chipset Family IDE-r Controller
+       1e3d  7 Series/C210 Series Chipset Family KT Controller
+       1e41  7 Series Chipset Family LPC Controller
+       1e42  7 Series Chipset Family LPC Controller
+       1e43  7 Series Chipset Family LPC Controller
+       1e44  Z77 Express Chipset LPC Controller
+       1e45  7 Series Chipset Family LPC Controller
+       1e46  Z75 Express Chipset LPC Controller
+       1e47  Q77 Express Chipset LPC Controller
+       1e48  Q75 Express Chipset LPC Controller
+       1e49  B75 Express Chipset LPC Controller
+       1e4a  H77 Express Chipset LPC Controller
+       1e4b  7 Series Chipset Family LPC Controller
+       1e4c  7 Series Chipset Family LPC Controller
+       1e4d  7 Series Chipset Family LPC Controller
+       1e4e  7 Series Chipset Family LPC Controller
+       1e4f  7 Series Chipset Family LPC Controller
+       1e50  7 Series Chipset Family LPC Controller
+       1e51  7 Series Chipset Family LPC Controller
+       1e52  7 Series Chipset Family LPC Controller
+       1e53  C216 Series Chipset LPC Controller
+       1e54  7 Series Chipset Family LPC Controller
+       1e55  QM77 Express Chipset LPC Controller
+       1e56  QS77 Express Chipset LPC Controller
+       1e57  HM77 Express Chipset LPC Controller
+       1e58  UM77 Express Chipset LPC Controller
+       1e59  HM76 Express Chipset LPC Controller
+       1e5a  7 Series Chipset Family LPC Controller
+       1e5b  UM77 Express Chipset LPC Controller
+       1e5c  7 Series Chipset Family LPC Controller
+       1e5d  HM75 Express Chipset LPC Controller
+       1e5e  7 Series Chipset Family LPC Controller
+       1e5f  7 Series Chipset Family LPC Controller
        2310  DH89xxCC LPC Controller
        2323  DH89xxCC 4 Port SATA AHCI Controller
        2330  DH89xxCC SMBus Controller
@@ -16984,7 +17465,7 @@
                1025 1016  Travelmate 612 TX
                104d 80df  Vaio PCG-FX403
        2448  82801 Mobile PCI Bridge
-# (rev d3) (prog-if (rev d3) (prog-if 01 [Subtractive decode])
+               1028 040b  Latitude E6510
                103c 0934  HP Compaq nw8240 Mobile Workstation
                103c 099c  NX6110/NC6120
                103c 309f  Compaq nx9420 Notebook
@@ -17046,7 +17527,9 @@
                1014 0267  NetVista A30p
                1028 020d  Inspiron 530
                1028 0211  Optiplex 755
+               1028 02da  OptiPlex 980
                103c 2a3b  Pavilion A1512X
+               103c 330b  ProLiant ML150 G6 Server
                1458 5000  GA-EP45-DS5 Motherboard
                1775 11cc  CC11/CL11
        2450  82801E ISA Bridge (LPC)
@@ -18248,7 +18731,6 @@
                1028 01da  OptiPlex 745
                1028 01f3  Inspiron 1420
                103c 30c0  Compaq 6710b
-# Name mistyped on previous submission
                103c 30c1  Compaq 6910p
                103c 30cc  Pavilion dv6700
                103c 30d9  Presario C700
@@ -18432,7 +18914,6 @@
        292c  82801IEM (ICH9M-E) SATA Controller [RAID mode]
        292d  82801IBM/IEM (ICH9M/ICH9M-E) 2 port SATA Controller [IDE mode]
                e4bf cc4d  CCM-BOOGIE
-       292e  ICH9M SATA IDE Controller
        2930  82801I (ICH9 Family) SMBus Controller
                1028 020d  Inspiron 530
                1028 0211  Optiplex 755
@@ -18883,11 +19364,15 @@
        2e16  4 Series Chipset PT IDER Controller
        2e17  4 Series Chipset Serial KT Controller
        2e20  4 Series Chipset DRAM Controller
-               1458 5000  GA-EP45-DS5 Motherboard
+               1043 82d3  P5Q Deluxe Motherboard
+               1458 5000  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
        2e21  4 Series Chipset PCI Express Root Port
+               1043 82d3  P5Q Deluxe Motherboard
                1458 5000  GA-EP45-DS5 Motherboard
        2e22  4 Series Chipset Integrated Graphics Controller
+               1458 d000  GA-EG45M-DS2H Mainboard
        2e23  4 Series Chipset Integrated Graphics Controller
+               1458 d000  GA-EG45M-DS2H Mainboard
        2e24  4 Series Chipset HECI Controller
        2e25  4 Series Chipset HECI Controller
        2e26  4 Series Chipset PT IDER Controller
@@ -18971,42 +19456,50 @@
                1028 0287  PowerEdge M610 I/O Hub to ESI Port
                1028 028c  PowerEdge R410 I/O Hub to ESI Port
                1028 028d  PowerEdge T410 I/O Hub to ESI Port
+               103c 330b  ProLiant ML150 G6 Server
        3404  5520/5500/X58 I/O Hub to ESI Port
        3405  5520/5500/X58 I/O Hub to ESI Port
        3406  5520 I/O Hub to ESI Port
+               103c 330b  ProLiant G6 series
        3407  5520/5500/X58 I/O Hub to ESI Port
        3408  5520/5500/X58 I/O Hub PCI Express Root Port 1
+               103c 330b  ProLiant G6 series
        3409  5520/5500/X58 I/O Hub PCI Express Root Port 2
        340a  5520/5500/X58 I/O Hub PCI Express Root Port 3
+               103c 330b  ProLiant ML150 G6 Server
        340b  5520/X58 I/O Hub PCI Express Root Port 4
        340c  5520/X58 I/O Hub PCI Express Root Port 5
        340d  5520/X58 I/O Hub PCI Express Root Port 6
        340e  5520/5500/X58 I/O Hub PCI Express Root Port 7
+               103c 330b  ProLiant ML150 G6 Server
        340f  5520/5500/X58 I/O Hub PCI Express Root Port 8
-       3410  5520/5500/X58 I/O Hub PCI Express Root Port 9
-       3411  5520/5500/X58 I/O Hub PCI Express Root Port 10
-       3418  5520/5500/X58 Physical Layer Port 0
-       3419  5520/5500 Physical Layer Port 1
-       3420  5500 Non-Legacy I/O Hub PCI Express Root Port 0
-       3421  5520 Non-Legacy I/O Hub PCI Express Root Port 0
-       3422  5520/5500/X58 I/O Hub GPIO and Scratch Pad Registers
-       3423  5520/5500/X58 I/O Hub Control Status and RAS Registers
-       3425  5520/5500/X58 Physical and Link Layer Registers Port 0
-       3426  5520/5500/X58 Routing and Protocol Layer Registers Port 0
-       3427  5520/5500 Physical and Link Layer Registers Port 1
-       3428  5520/5500 Routing & Protocol Layer Register Port 1
+       3410  7500/5520/5500/X58 I/O Hub PCI Express Root Port 9
+       3411  7500/5520/5500/X58 I/O Hub PCI Express Root Port 10
+       3418  7500/5520/5500/X58 Physical Layer Port 0
+       3419  7500/5520/5500 Physical Layer Port 1
+       3420  7500/5520/5500/X58 I/O Hub PCI Express Root Port 0
+       3421  7500/5520/5500/X58 I/O Hub PCI Express Root Port 0
+       3422  7500/5520/5500/X58 I/O Hub GPIO and Scratch Pad Registers
+               103c 330b  ProLiant G6 series
+       3423  7500/5520/5500/X58 I/O Hub Control Status and RAS Registers
+               103c 330b  ProLiant G6 series
+       3425  7500/5520/5500/X58 Physical and Link Layer Registers Port 0
+       3426  7500/5520/5500/X58 Routing and Protocol Layer Registers Port 0
+       3427  7500/5520/5500 Physical and Link Layer Registers Port 1
+       3428  7500/5520/5500 Routing & Protocol Layer Register Port 1
        3429  5520/5500/X58 Chipset QuickData Technology Device
        342a  5520/5500/X58 Chipset QuickData Technology Device
        342b  5520/5500/X58 Chipset QuickData Technology Device
        342c  5520/5500/X58 Chipset QuickData Technology Device
-       342d  5520/5500/X58 I/O Hub I/OxAPIC Interrupt Controller
-       342e  5520/5500/X58 I/O Hub System Management Registers
-       342f  5520/5500/X58 Trusted Execution Technology Registers
+       342d  7500/5520/5500/X58 I/O Hub I/OxAPIC Interrupt Controller
+       342e  7500/5520/5500/X58 I/O Hub System Management Registers
+               103c 330b  ProLiant G6 series
+       342f  7500/5520/5500/X58 Trusted Execution Technology Registers
        3430  5520/5500/X58 Chipset QuickData Technology Device
        3431  5520/5500/X58 Chipset QuickData Technology Device
        3432  5520/5500/X58 Chipset QuickData Technology Device
        3433  5520/5500/X58 Chipset QuickData Technology Device
-       3438  5520/5500/X58 I/O Hub Throttle Registers
+       3438  7500/5520/5500/X58 I/O Hub Throttle Registers
        3500  6311ESB/6321ESB PCI Express Upstream Port
        3501  6310ESB PCI Express Upstream Port
        3504  6311ESB/6321ESB I/OxAPIC Interrupt Controller
@@ -19192,6 +19685,8 @@
        3a16  82801JIR (ICH10R) LPC Interface Controller
                1028 028c  PowerEdge R410 LPC Interface Controller
                1028 028d  PowerEdge T410 LPC Interface Controller
+               103c 330b  ProLiant G6 series
+               1043 82d4  P5Q Deluxe Motherboard
                1458 5001  GA-EP45-DS5 Motherboard
        3a18  82801JIB (ICH10) LPC Interface Controller
        3a1a  82801JD (ICH10D) LPC Interface Controller
@@ -19199,8 +19694,9 @@
                1028 028c  PowerEdge R410 SATA IDE Controller
                1028 028d  PowerEdge T410 SATA IDE Controller
        3a22  82801JI (ICH10 Family) SATA AHCI Controller
+               103c 330b  ProLiant G6 series
                1043 82d4  P5Q Deluxe Motherboard
-               1458 b005  GA-EP45-DS5 Motherboard
+               1458 b005  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
        3a25  82801JIR (ICH10R) SATA RAID Controller
                1028 028c  PERC S100 Controller (PE R410)
                1028 028d  PERC S100 Controller (PE T410)
@@ -19209,48 +19705,68 @@
                1028 028c  PowerEdge R410 SATA IDE Controller
                1028 028d  PowerEdge T410 SATA IDE Controller
        3a30  82801JI (ICH10 Family) SMBus Controller
-               1458 5001  GA-EP45-DS5 Motherboard
+               1043 82d4  P5Q Deluxe Motherboard
+               1458 5001  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
        3a32  82801JI (ICH10 Family) Thermal Subsystem
        3a34  82801JI (ICH10 Family) USB UHCI Controller #1
                1028 028c  PowerEdge R410 USB UHCI Controller
                1028 028d  PowerEdge T410 USB UHCI Controller
+               103c 330b  ProLiant G6 series
+               1043 82d4  P5Q Deluxe Motherboard
                1458 5004  GA-EP45-DS5 Motherboard
        3a35  82801JI (ICH10 Family) USB UHCI Controller #2
                1028 028c  PowerEdge R410 USB UHCI Controller
                1028 028d  PowerEdge T410 USB UHCI Controller
+               103c 330b  ProLiant G6 series
+               1043 82d4  P5Q Deluxe Motherboard
                1458 5004  GA-EP45-DS5 Motherboard
        3a36  82801JI (ICH10 Family) USB UHCI Controller #3
                1028 028c  PowerEdge R410 USB UHCI Controller
                1028 028d  PowerEdge T410 USB UHCI Controller
+               103c 330b  ProLiant G6 series
+               1043 82d4  P5Q Deluxe Motherboard
                1458 5004  GA-EP45-DS5 Motherboard
        3a37  82801JI (ICH10 Family) USB UHCI Controller #4
                1028 028c  PowerEdge R410 USB UHCI Controller
                1028 028d  PowerEdge T410 USB UHCI Controller
-               1458 5004  GA-EP45-DS5 Motherboard
+               103c 330b  ProLiant G6 series
+               1043 82d4  P5Q Deluxe Motherboard
+               1458 5004  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
        3a38  82801JI (ICH10 Family) USB UHCI Controller #5
                1028 028c  PowerEdge R410 USB UHCI Controller
                1028 028d  PowerEdge T410 USB UHCI Controller
-               1458 5004  GA-EP45-DS5 Motherboard
+               103c 330b  ProLiant ML150 G6 Server
+               1043 82d4  P5Q Deluxe Motherboard
+               1458 5004  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
        3a39  82801JI (ICH10 Family) USB UHCI Controller #6
                1028 028c  PowerEdge R410 USB UHCI Controller
                1028 028d  PowerEdge T410 USB UHCI Controller
-               1458 5004  GA-EP45-DS5 Motherboard
+               103c 330b  ProLiant ML150 G6 Server
+               1043 82d4  P5Q Deluxe Motherboard
+               1458 5004  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
        3a3a  82801JI (ICH10 Family) USB2 EHCI Controller #1
                1028 028c  PowerEdge R410 USB EHCI Controller
                1028 028d  PowerEdge T410 USB EHCI Controller
+               103c 330b  ProLiant G6 series
+               1043 82d4  P5Q Deluxe Motherboard
                1458 5006  GA-EP45-DS5 Motherboard
        3a3c  82801JI (ICH10 Family) USB2 EHCI Controller #2
                1028 028c  PowerEdge R410 USB EHCI Controller
                1028 028d  PowerEdge T410 USB EHCI Controller
+               103c 330b  ProLiant G6 series
+               1043 82d4  P5Q Deluxe Motherboard
                1458 5006  GA-EP45-DS5 Motherboard
        3a3e  82801JI (ICH10 Family) HD Audio Controller
+               1043 8311  P5Q Deluxe Motherboard
                1458 a002  GA-EP45-UD3R Motherboard
-               1458 a102  GA-EP45-DS5 Motherboard
+               1458 a102  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
        3a40  82801JI (ICH10 Family) PCI Express Root Port 1
                1028 028c  PowerEdge R410 PCI Express Port 1
                1028 028d  PowerEdge T410 PCI Express Port 1
+               103c 330b  ProLiant ML150 G6 Server
+               1043 82d4  P5Q Deluxe Motherboard
                1043 82ea  P6T DeLuxe Motherboard
-               1458 5001  GA-EP45-DS5 Motherboard
+               1458 5001  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
        3a42  82801JI (ICH10 Family) PCI Express Port 2
        3a44  82801JI (ICH10 Family) PCI Express Root Port 3
                1043 82ea  P6T DeLuxe Motherboard
@@ -19258,11 +19774,14 @@
                1043 82ea  P6T DeLuxe Motherboard
                1458 5001  GA-EP45-DS5 Motherboard
        3a48  82801JI (ICH10 Family) PCI Express Root Port 5
+               103c 330b  ProLiant ML150 G6 Server
                1043 82ea  P6T Deluxe Motherboard
                1458 5001  GA-EP45-DS5 Motherboard
        3a4a  82801JI (ICH10 Family) PCI Express Root Port 6
+               103c 330b  ProLiant ML150 G6 Server
+               1043 82d4  P5Q Deluxe Motherboard
                1043 82ea  P6T DeLuxe Motherboard
-               1458 5001  GA-EP45-DS5 Motherboard
+               1458 5001  GA-EP45-DS5/GA-EG45M-DS2H Motherboard
        3a4c  82801JI (ICH10 Family) Gigabit Ethernet Controller
        3a51  82801JDO (ICH10DO) VECI Controller
        3a55  82801JD/DO (ICH10 Family) Virtual SATA Controller
@@ -19298,6 +19817,7 @@
        3b09  Mobile 5 Series Chipset LPC Interface Controller
                1025 0347  Aspire 7740G
        3b0a  5 Series Chipset LPC Interface Controller
+               1028 02da  OptiPlex 980
        3b0b  Mobile 5 Series Chipset LPC Interface Controller
        3b0c  5 Series Chipset LPC Interface Controller
        3b0d  5 Series/3400 Series Chipset LPC Interface Controller
@@ -19322,6 +19842,7 @@
        3b20  5 Series/3400 Series Chipset 4 port SATA IDE Controller
        3b21  5 Series/3400 Series Chipset 2 port SATA IDE Controller
        3b22  5 Series/3400 Series Chipset 6 port SATA AHCI Controller
+               1028 02da  OptiPlex 980
        3b23  5 Series/3400 Series Chipset 4 port SATA AHCI Controller
        3b25  5 Series/3400 Series Chipset SATA RAID Controller
        3b26  5 Series/3400 Series Chipset 2 port SATA IDE Controller
@@ -19334,15 +19855,18 @@
        3b2e  5 Series/3400 Series Chipset 4 port SATA IDE Controller
                e4bf 50c1  PC1-GROOVE
        3b2f  5 Series/3400 Series Chipset 6 port SATA AHCI Controller
+               1028 040b  Latitude E6510
                e4bf 50c1  PC1-GROOVE
        3b30  5 Series/3400 Series Chipset SMBus Controller
                1025 0347  Aspire 7740G
+               1028 02da  OptiPlex 980
                1028 040b  Latitude E6510
                e4bf 50c1  PC1-GROOVE
        3b32  5 Series/3400 Series Chipset Thermal Subsystem
                1025 0347  Aspire 7740G
        3b34  5 Series/3400 Series Chipset USB2 Enhanced Host Controller
                1025 0347  Aspire 7740G
+               1028 02da  OptiPlex 980
                1028 040b  Latitude E6510
                e4bf 50c1  PC1-GROOVE
        3b36  5 Series/3400 Series Chipset USB Universal Host Controller
@@ -19353,6 +19877,7 @@
        3b3b  5 Series/3400 Series Chipset USB Universal Host Controller
        3b3c  5 Series/3400 Series Chipset USB2 Enhanced Host Controller
                1025 0347  Aspire 7740G
+               1028 02da  OptiPlex 980
                1028 040b  Latitude E6510
                e4bf 50c1  PC1-GROOVE
        3b3e  5 Series/3400 Series Chipset USB Universal Host Controller
@@ -19360,16 +19885,23 @@
        3b40  5 Series/3400 Series Chipset USB Universal Host Controller
        3b41  5 Series/3400 Series Chipset LAN Controller
        3b42  5 Series/3400 Series Chipset PCI Express Root Port 1
+               1028 02da  OptiPlex 980
+               1028 040b  Latitude E6510
        3b44  5 Series/3400 Series Chipset PCI Express Root Port 2
+               1028 040b  Latitude E6510
        3b46  5 Series/3400 Series Chipset PCI Express Root Port 3
+               1028 040b  Latitude E6510
        3b48  5 Series/3400 Series Chipset PCI Express Root Port 4
+               1028 040b  Latitude E6510
        3b4a  5 Series/3400 Series Chipset PCI Express Root Port 5
+               1028 02da  OptiPlex 980
        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
        3b53  5 Series/3400 Series Chipset VECI Controller
        3b56  5 Series/3400 Series Chipset High Definition Audio
                1025 0347  Aspire 7740G
+               1028 02da  OptiPlex 980
                1028 040b  Latitude E6510
                e4bf 50c1  PC1-GROOVE
        3b57  5 Series/3400 Series Chipset High Definition Audio
@@ -19796,80 +20328,80 @@
        8817  Platform Controller Hub EG20T I2C Controller
        8818  Platform Controller Hub EG20T Controller Area Network (CAN) Controller
        8819  Platform Controller Hub EG20T IEEE 1588 Hardware Assist
-       8c00  Lynx Point 4-Port SATA IDE Controller
-       8c01  Lynx Point 4-Port SATA IDE Controller
-       8c02  Lynx Point 6-Port SATA AHCI Controller
-       8c03  Lynx Point 6-Port SATA AHCI Controller
-       8c04  Lynx Point SATA RAID Controller
-       8c05  Lynx Point SATA RAID Controller
-       8c06  Lynx Point SATA RAID Controller
-       8c07  Lynx Point SATA RAID Controller
-       8c08  Lynx Point 2-Port SATA IDE Controller
-       8c09  Lynx Point 2-Port SATA IDE Controller
-       8c0e  Lynx Point SATA RAID Controller
-       8c0f  Lynx Point SATA RAID Controller
-       8c10  Lynx Point PCI Express Root Port 1
-       8c11  Lynx Point PCI Express Root Port 1
-       8c12  Lynx Point PCI Express Root Port 2
-       8c13  Lynx Point PCI Express Root Port 2
-       8c14  Lynx Point PCI Express Root Port 3
-       8c15  Lynx Point PCI Express Root Port 3
-       8c16  Lynx Point PCI Express Root Port 4
-       8c17  Lynx Point PCI Express Root Port 4
-       8c18  Lynx Point PCI Express Root Port 5
-       8c19  Lynx Point PCI Express Root Port 5
-       8c1a  Lynx Point PCI Express Root Port 6
-       8c1b  Lynx Point PCI Express Root Port 6
-       8c1c  Lynx Point PCI Express Root Port 7
-       8c1d  Lynx Point PCI Express Root Port 7
-       8c1e  Lynx Point PCI Express Root Port 8
-       8c1f  Lynx Point PCI Express Root Port 8
-       8c20  Lynx Point HD Audio Controller
-       8c21  Lynx Point HD Audio Controller
-       8c22  Lynx Point SMBus Controller
-       8c23  Lynx Point CHAP Counter
-       8c24  Lynx Point Thermal Management Controller
-       8c26  Lynx Point USB Enhanced Host Controller #1
-       8c2d  Lynx Point USB Enhanced Host Controller #2
-       8c31  Lynx Point USB xHCI Host Controller
-       8c33  Lynx Point LAN Controller
-       8c34  Lynx Point NAND Controller
-       8c3a  Lynx Point MEI Controller #1
-       8c3b  Lynx Point MEI Controller #2
-       8c3c  Lynx Point IDE-r Controller
-       8c3d  Lynx Point KT Controller
-       8c40  Lynx Point LPC Controller
-       8c41  Lynx Point LPC Controller
-       8c42  Lynx Point LPC Controller
-       8c43  Lynx Point LPC Controller
-       8c44  Lynx Point LPC Controller
-       8c45  Lynx Point LPC Controller
-       8c46  Lynx Point LPC Controller
-       8c47  Lynx Point LPC Controller
-       8c48  Lynx Point LPC Controller
-       8c49  Lynx Point LPC Controller
-       8c4a  Lynx Point LPC Controller
-       8c4b  Lynx Point LPC Controller
-       8c4c  Lynx Point LPC Controller
-       8c4d  Lynx Point LPC Controller
-       8c4e  Lynx Point LPC Controller
-       8c4f  Lynx Point LPC Controller
-       8c50  Lynx Point LPC Controller
-       8c51  Lynx Point LPC Controller
-       8c52  Lynx Point LPC Controller
-       8c53  Lynx Point LPC Controller
-       8c54  Lynx Point LPC Controller
-       8c55  Lynx Point LPC Controller
-       8c56  Lynx Point LPC Controller
-       8c57  Lynx Point LPC Controller
-       8c58  Lynx Point LPC Controller
-       8c59  Lynx Point LPC Controller
-       8c5a  Lynx Point LPC Controller
-       8c5b  Lynx Point LPC Controller
-       8c5c  Lynx Point LPC Controller
-       8c5d  Lynx Point LPC Controller
-       8c5e  Lynx Point LPC Controller
-       8c5f  Lynx Point LPC Controller
+       8c00  8 Series/C220 Series Chipset Family 4-port SATA Controller 1 [IDE mode]
+       8c01  8 Series Chipset Family 4-port SATA Controller 1 [IDE mode]
+       8c02  8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode]
+       8c03  8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode]
+       8c04  8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode]
+       8c05  8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode]
+       8c06  8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode]
+       8c07  8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode]
+       8c08  8 Series/C220 Series Chipset Family 2-port SATA Controller 2 [IDE mode]
+       8c09  8 Series/C220 Series Chipset Family 2-port SATA Controller 2 [IDE mode]
+       8c0e  8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode]
+       8c0f  8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode]
+       8c10  8 Series/C220 Series Chipset Family PCI Express Root Port #1
+       8c11  8 Series/C220 Series Chipset Family PCI Express Root Port #1
+       8c12  8 Series/C220 Series Chipset Family PCI Express Root Port #2
+       8c13  8 Series/C220 Series Chipset Family PCI Express Root Port #2
+       8c14  8 Series/C220 Series Chipset Family PCI Express Root Port #3
+       8c15  8 Series/C220 Series Chipset Family PCI Express Root Port #3
+       8c16  8 Series/C220 Series Chipset Family PCI Express Root Port #4
+       8c17  8 Series/C220 Series Chipset Family PCI Express Root Port #4
+       8c18  8 Series/C220 Series Chipset Family PCI Express Root Port #5
+       8c19  8 Series/C220 Series Chipset Family PCI Express Root Port #5
+       8c1a  8 Series/C220 Series Chipset Family PCI Express Root Port #6
+       8c1b  8 Series/C220 Series Chipset Family PCI Express Root Port #6
+       8c1c  8 Series/C220 Series Chipset Family PCI Express Root Port #7
+       8c1d  8 Series/C220 Series Chipset Family PCI Express Root Port #7
+       8c1e  8 Series/C220 Series Chipset Family PCI Express Root Port #8
+       8c1f  8 Series/C220 Series Chipset Family PCI Express Root Port #8
+       8c20  8 Series/C220 Series Chipset High Definition Audio Controller
+       8c21  8 Series/C220 Series Chipset High Definition Audio Controller
+       8c22  8 Series/C220 Series Chipset Family SMBus Controller
+       8c23  8 Series Chipset Family CHAP Counters
+       8c24  8 Series Chipset Family Thermal Management Controller
+       8c26  8 Series/C220 Series Chipset Family USB EHCI #1
+       8c2d  8 Series/C220 Series Chipset Family USB EHCI #2
+       8c31  8 Series/C220 Series Chipset Family USB xHCI
+       8c33  8 Series/C220 Series Chipset Family LAN Controller
+       8c34  8 Series/C220 Series Chipset Family NAND Controller
+       8c3a  8 Series/C220 Series Chipset Family MEI Controller #1
+       8c3b  8 Series/C220 Series Chipset Family MEI Controller #2
+       8c3c  8 Series/C220 Series Chipset Family IDE-r Controller
+       8c3d  8 Series/C220 Series Chipset Family KT Controller
+       8c40  8 Series/C220 Series Chipset Family LPC Controller
+       8c41  8 Series Chipset Family Mobile Super SKU LPC Controller
+       8c42  8 Series/C220 Series Chipset Family Desktop Super SKU LPC Controller
+       8c43  8 Series/C220 Series Chipset Family LPC Controller
+       8c44  Z87 Express Chipset LPC Controller
+       8c45  8 Series/C220 Series Chipset Family LPC Controller
+       8c46  Z85 Express Chipset LPC Controller
+       8c47  8 Series/C220 Series Chipset Family LPC Controller
+       8c48  8 Series/C220 Series Chipset Family LPC Controller
+       8c49  HM86 Express Chipset LPC Controller
+       8c4a  H87 Express Chipset LPC Controller
+       8c4b  HM87 Express Chipset LPC Controller
+       8c4c  Q85 Express Chipset LPC Controller
+       8c4d  8 Series/C220 Series Chipset Family LPC Controller
+       8c4e  Q87 Express Chipset LPC Controller
+       8c4f  QM87 Express Chipset LPC Controller
+       8c50  B85 Express Chipset LPC Controller
+       8c51  8 Series/C220 Series Chipset Family LPC Controller
+       8c52  C222 Series Chipset Family Server Essential SKU LPC Controller
+       8c53  8 Series/C220 Series Chipset Family LPC Controller
+       8c54  C224 Series Chipset Family Server Standard SKU LPC Controller
+       8c55  8 Series/C220 Series Chipset Family LPC Controller
+       8c56  C226 Series Chipset Family Server Advanced SKU LPC Controller
+       8c57  8 Series/C220 Series Chipset Family LPC Controller
+       8c58  8 Series/C220 Series Chipset Family WS SKU LPC Controller
+       8c59  8 Series/C220 Series Chipset Family LPC Controller
+       8c5a  8 Series/C220 Series Chipset Family LPC Controller
+       8c5b  8 Series/C220 Series Chipset Family LPC Controller
+       8c5c  H81 Express Chipset/C220 Series Chipset Family LPC Controller
+       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
        9000  IXP2000 Family Network Processor
        9001  IXP2400 Network Processor
        9002  IXP2300 Network Processor
@@ -19878,16 +20410,72 @@
        9622  Integrated RAID
        9641  Integrated RAID
        96a1  Integrated RAID
-       a000  N10 Family DMI Bridge
+       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]
+       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
+       9c20  Lynx Point-LP HD Audio Controller
+       9c21  Lynx Point-LP HD Audio Controller
+       9c22  Lynx Point-LP SMBus Controller
+       9c23  Lynx Point-LP CHAP Counters
+       9c24  Lynx Point-LP Thermal
+       9c26  Lynx Point-LP USB EHCI #1
+       9c31  Lynx Point-LP USB xHCI HC
+       9c35  Lynx Point-LP SDIO Controller
+       9c36  Lynx Point-LP Audio DSP Controller
+       9c3a  Lynx Point-LP HECI #0
+       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
+       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
+       a000  Atom Processor D4xx/D5xx/N4xx/N5xx DMI Bridge
                8086 4f4d  DeskTop Board D510MO
-       a001  N10 Family Integrated Graphics Controller
+       a001  Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller
                8086 4f4d  DeskTop Board D510MO
-       a002  N10 Family Integrated Graphics Controller
-       a003  N10 Family CHAPS counter
-       a010  N10 Family DMI Bridge
-       a011  N10 Family Integrated Graphics Controller
-       a012  N10 Family Integrated Graphics Controller
-       a013  N10 Family CHAPS counter
+       a002  Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller
+       a003  Atom Processor D4xx/D5xx/N4xx/N5xx CHAPS counter
+       a010  Atom Processor D4xx/D5xx/N4xx/N5xx DMI Bridge
+       a011  Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller
+       a012  Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller
+       a013  Atom Processor D4xx/D5xx/N4xx/N5xx CHAPS counter
        a620  6400/6402 Advanced Memory Buffer (AMB)
        b152  21152 PCI-to-PCI Bridge
                8086 b152  21152 PCI-to-PCI Bridge
@@ -19902,6 +20490,7 @@
                e4bf 1000  CC8-1-BLUES
        d130  Core Processor DMI
        d131  Core Processor DMI
+               1028 02da  OptiPlex 980
        d132  Core Processor DMI
                1028 040b  Latitude E6510
        d133  Core Processor DMI
@@ -19910,6 +20499,8 @@
        d136  Core Processor DMI
        d137  Core Processor DMI
        d138  Core Processor PCI Express Root Port 1
+               1028 02da  OptiPlex 980
+               1028 040b  Latitude E6510
        d139  Core Processor PCI Express Root Port 2
        d13a  Core Processor PCI Express Root Port 3
        d13b  Core Processor PCI Express Root Port 4
@@ -20230,6 +20821,31 @@
                9005 02b3  2400
                9005 02b4  ICP ICP5045AL
                9005 0800  Callisto
+       028b  Series 6 - 6G SAS/PCIe 2
+               9005 0200  Series 6 Entry Level - ASR-6405E - 4 internal 6G SAS ports
+               9005 0201  Series 6 Entry Level - ASR-6805E - 8 internal 6G SAS ports
+               9005 0300  Series 6 - ASR-6405 - 4 internal 6G SAS ports
+               9005 0301  Series 6 - ASR-6805 - 8 internal 6G SAS ports
+               9005 0302  Series 6 - ASR-6445 - 4 internal and 4 external 6G SAS ports
+               9005 0310  Series 6 Connectors on Top - ASR-6405T - 4 internal 6G SAS ports
+               9005 0311  Series 6 Connectors on Top - ASR-6805T - 8 internal 6G SAS
+               9005 0400  Series 6 - ASR-61205 - 12 internal 6G SAS ports
+               9005 0401  Series 6 - ASR-61605 - 16 internal 6G SAS ports
+               9005 0403  Series 6 - ASR-62405 - 24 internal 6G SAS ports
+       028c  Series 7 6G SAS/PCIe 3
+               9005 0500  Series 7 - ASR-7805 - 8 internal 6G SAS Port/PCIe 3.0
+               9005 0501  Series 7 - ASR-71605 - 16 internal 6G SAS Port/PCIe 3.0
+               9005 0502  Series 7 - ASR-71685 - 16 internal 8 external 6G SAS Port/PCIe 3.0
+               9005 0503  Series 7 - ASR-72405 - 24 internal 0 external 6G SAS Port/PCIe 3.0
+               9005 0504  Series 7 - ASR-7885 - 8 internal 8 external 6G SAS Port/PCIe 3.0
+               9005 0505  Series 7 Entry Level - ASR-71685E - 16 internal 8 external 6G SAS Port/PCIe 3.0
+               9005 0506  Series 7 Entry Level - ASR-72405E - 24 internal 0 external 6G SAS Port/PCIe 3.0
+       028d  Series 8 12G SAS/PCIe 3
+               9005 0550  Series 8 - ASR-82405 - 24 internal 0 external 12G SAS Port/PCIe 3.0
+               9005 0551  Series 8 - ASR-81605 - 16 internal 0 external 12G SAS Port/PCIe 3.0
+               9005 0552  Series 8 - ASR-8805 - 8 internal 0 external 12G SAS Port/PCIe 3.0
+               9005 0553  Series 8 - ASR-8085 - 0 internal 8 external 12G SAS Port/PCIe 3.0
+               9005 0554  Series 8 - ASR-8885 - 8 internal 8 external 12G SAS Port/PCIe 3.0
        0410  AIC-9410W SAS (Razor HBA RAID)
                9005 0410  ASC-48300(Spirit RAID)
                9005 0411  ASC-58300 (Oakmont RAID)
@@ -20325,6 +20941,8 @@
        9865  PCI 9865 Multi-I/O Controller
        9901  PCIe 9901 Multi-I/O Controller
        9904  4-Port PCIe Serial Adapter
+# 2-port Serial 1-port Parallel Adaptor
+       9912  PCIe 9912 Multi-I/O Controller
        9922  PCIe 9922 Multi-I/O Controller
        9990  MCS9990 PCIe to 4‐Port USB 2.0 Host Controller
 9902  Stargen Inc.

diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids
index c21fff14d2815ca6bce780673a1e4d4ba560a657..1b8f2c6b1d36dc4d1d3ffe6b4bc6d327258f0842 100644 (file)
--- 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: 2012.02.08
-# Date:    2012-02-08 20:34:02
+# Version: 2012.07.30
+# Date:    2012-07-30 20:34:03
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -22,6 +22,7 @@
 
 0001  Fry's Electronics
        142b  Arbiter Systems, Inc.
+       7778  Counterfeit flash drive [Kingston]
 0002  Ingram
 0003  Club Mac
 0004  Nebraska Furniture Mart
@@ -98,6 +99,7 @@
        2105  AVRONE!
        2106  STK600 development board
        2107  AVR Dragon
+       2109  STK541 ZigBee Development Board
        210d  XPLAIN evaluation kit (CDC ACM)
        2122  XMEGA-A1 Explained evaluation kit
        2310  EVK11xx evaluation board
@@ -109,7 +111,11 @@
        4102  AirVast W-Buddie WN210
        5601  at76c510 Prism-II 802.11b Access Point
        5603  Cisco 7920 WiFi IP Phone
+       6119  AT91SAM CDC Demo Application
        6124  at91sam SAMBA bootloader
+       6127  AT91SAM HID Keyboard Demo Application
+       6129  AT91SAM Mass Storage Demo Application
+       6200  AT91SAM HID Mouse Demo Application
        7603  D-Link DWL-120 802.11b Wireless Adapter [Atmel at76c503a]
        7604  at76c503a 802.11b Adapter
        7605  at76c503a 802.11b Adapter
@@ -248,6 +254,7 @@
        1311  OfficeJet V30
        1312  DeskJet 460
        1317  LaserJet 1005
+       1327  iLO Virtual Hub
        1405  ScanJet 3670
        1411  PSC 750
        1424  f2105 Monitor Hub
@@ -323,6 +330,7 @@
        2311  OfficeJet d series
        2312  OfficeJet Pro L7700
        2317  LaserJet 4350
+       231d  4 GB Flash Drive
        2402  PhotoSmart 7700 series
        2404  Deskjet F2280 series
        2405  ScanJet 4070 PhotoSmart
@@ -356,6 +364,7 @@
        2c12  Officejet J4680
        2c17  LaserJet 1022
        2c24  Logitech M-UAL-96 Mouse
+       2d05  Scanjet 7000
        2d11  OfficeJet 6110
        2d17  Printing Support
        2e11  PSC 1000
@@ -598,7 +607,7 @@
 03f1  Genoa Technology
 03f2  Oak Technology, Inc.
 03f3  Adaptec, Inc.
-       0020  AWN-8020 WLAN
+       0020  AWN-8020 WLAN [Intersil PRISM 2.5]
        0080  AVC-1100 Audio Capture
        0083  AVC-2200 Device
        0087  AVC-2210 Loader
@@ -617,7 +626,7 @@
 03f5  Siemens Electromechanical
 03f8  Epson Imaging Technology Center
 03f9  KeyTronic Corp.
-       0100  Keyboard
+       0100  KT-2001 Keyboard
        0101  Keyboard
        0102  Keyboard Mouse
 03fb  OPTi, Inc.
@@ -657,19 +666,38 @@
        0232  Serial Converter
        1060  JTAG adapter
        6001  FT232 USB-Serial (UART) IC
+       6002  Lumel PD12
        6007  Serial Converter
        6008  Serial Converter
        6009  Serial Converter
        6010  FT2232C Dual USB-UART/FIFO IC
        6011  FT4232H Quad HS USB-UART/FIFO IC
        6014  FT232H Single HS USB-UART/FIFO IC
+       6015  Bridge(I2C/SPI/UART/FIFO)
        8040  4 Port Hub
        8070  7 Port Hub
        8370  7 Port Hub
        8371  PS/2 Keyboard And Mouse
        8372  FT8U100AX Serial Port
+       8a28  Rainforest Automation ZigBee Controller
+       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]
+       abb8  Lego Mindstorms NXTCam
+       b810  US Interface Navigator (CAT and 2nd PTT lines)
+       b811  US Interface Navigator (WKEY and FSK lines)
+       b812  US Interface Navigator (RS232 and CONFIG lines)
+       baf8  Amontec JTAGkey - Open On-Chip Debugger
        bcd8  Stellaris Development Board
        bcd9  Stellaris Evaluation Board
+       bcda  Stellaris ICDI Board
+       bdc8  Egnite GmbH - JTAG/RS-232 adapter
+       bfd8  OpenDCC
+       bfd9  OpenDCC (Sniffer)
+       bfda  OpenDCC (Throttle)
+       bfdb  OpenDCC (Gateway)
+       bfdc  OpenDCC (GBM)
        c630  lcd2usb interface
        c631  i2c-tiny-usb interface
        c632  xu1541 c64 floppy drive interface
@@ -683,20 +711,25 @@
        c8bc  Alpermann+Velte Rubidium S1
        c8bd  Alpermann+Velte Rubidium T1
        c8be  Alpermann+Velte Rubidium D1
-       cc48  product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi
-       cc49  product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru
-       cc4a  product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal
+       cc48  Tactrix OpenPort 1.3 Mitsubishi
+       cc49  Tactrix OpenPort 1.3 Subaru
+       cc4a  Tactrix OpenPort 1.3 Universal
+       cff8  Distortec JTAG-lock-pick
        d010  SCS PTC-IIusb
        d011  SCS Position-Tracker/TNC
        d012  SCS DRAGON 1
        d013  SCS DRAGON 1
+       d578  Accesio USB-COM-4SM
        d6f8  UNI Black BOX
+       d738  Propox JTAGcable II
+       d739  Propox ISPcable III
        d9a9  Actisense USG-1 NMEA Serial Gateway
        d9aa  Actisense NGT-1 NMEA2000 PC Interface
        e0d0  Total Phase Aardvark I2C/SPI Host Adapter
        e521  EVER Sinline XL Series UPS
        e6c8  PYRAMID Computer GmbH LCD
        e700  Elster Unicom III Optical Probe
+       e729  Segway Robotic Mobility Platforms 200
        e888  Expert ISDN Control USB
        e889  USB-RS232 OptoBridge
        e88a  Expert mouseCLOCK USB II
@@ -712,8 +745,11 @@
        f1a0  Asix PRESTO Programmer
        f208  Papenmeier Braille-Display
        f3c0  4N-GALAXY Serial Converter
+       f608  CTI USB-485-Mini
+       f60b  CTI USB-Nano-485
        f680  Suunto Sports Instrument
        f758  GW Instek GDS-8x0 Oscilloscope
+       f7c0  ZeitControl Cardsystems TagTracer MIFARE
        f850  USB-UIRT (Universal Infrared Receiver+Transmitter)
        f918  Ant8 Logic Probe
        fa00  Matrix Orbital USB Serial
@@ -730,12 +766,12 @@
        fd48  ShipModul MiniPlex-4xUSB NMEA Multiplexer
        fd49  ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer
        ff08  ToolHouse LoopBack Adapter
-       ff18  Logbook Bus
+       ff18  ScienceScope Logbook ML
        ff19  Logbook Bus
        ff1a  Logbook Bus
        ff1b  Logbook Bus
-       ff1c  Logbook Bus
-       ff1d  Logbook Bus
+       ff1c  ScienceScope Logbook LS
+       ff1d  ScienceScope Logbook HS
        ff1e  Logbook Bus
        ff1f  Logbook Bus
 0404  NCR Corp.
@@ -783,6 +819,8 @@
        0059  HighSpeed Hub
        005a  HighSpeed Hub
        006a  Conceptronic USB Harddisk Box
+       007d  MINICUBE2
+       007e  PG-FP5 Flash Memory Programmer
        0081  SuperScript 1400 Series
        0082  SuperScript 1400 Series
        0094  Japanese Keyboard with One-touch start buttons
@@ -804,6 +842,8 @@
        0249  Aterm WL300NU-G
        02b4  Aterm WL300NU-AG
        02b6  Aterm WL300NU-GS 802.11n Wireless Adapter
+       0300  LifeTouch Note
+       0301  LifeTouch Note (debug mode)
        55aa  Hub
        55ab  Hub [iMac/iTouch kbd]
        8010  Intellibase Hub
@@ -949,6 +989,7 @@
        6510  Weltrend Bar Code Reader
        6520  XBOX Xploder
        6533  Speed-Link Competition Pro
+       6543  Manhattan Magnetic Card Strip Reader
 040c  VTech Computers, Ltd
 040d  VIA Technologies, Inc.
        3184  VNT VT6656 USB-802.11 Wireless LAN Adapter
@@ -978,7 +1019,8 @@
        0065  Python2 WDM Encoder
        0066  WLI-U2-KG54 WLAN
        0067  WLI-U2-KG54-AI WLAN
-       0089  Buffalo RUF-C/U2 Flash Drive
+       006e  LUA-U2-GT 10/100/1000 Ethernet Adapter
+       0089  RUF-C/U2 Flash Drive
        008b  Nintendo Wi-Fi
        0091  WLI-U2-KAMG54 Wireless LAN Adapter
        0092  WLI-U2-KAMG54 Bootloader
@@ -1006,6 +1048,7 @@
        01a1  MiniStation Metro
        01a2  WLI-UC-GNM Wireless LAN Adapter [Ralink RT8070]
        01ee  WLI-UC-GNM2 Wireless LAN Adapter [Ralink RT3070]
+       01fd  WLI-UC-G450 Wireless LAN Adapter
 0412  Award Software International
 0413  Leadtek Research, Inc.
        1310  WinFast TV - NTSC + FM
@@ -1270,6 +1313,8 @@
        02e3  5230 (PC-Suite mode)
        02e4  5230 (Imaging mode)
        03a4  C5 (Storage mode)
+       03c0  C7-00
+       03d1  N950
        0400  7600 Phone Parent
        0401  6650 GSM Phone
        0402  6255 Phone Parent
@@ -1331,6 +1376,7 @@
        04f9  6300 (PC Suite mode)
        0508  E65 (PC Suite mode)
        0509  E65 (Storage mode)
+       0518  N9 Phone
        0600  Digital Pen SU-1B
        0610  CS-15 (Internet Stick 3G modem)
        0800  Connectivity Cable DKU-5
@@ -1362,6 +1408,7 @@
        2503  USB 2.0 Hub
        2504  USB 2.0 Hub
        2512  USB 2.0 Hub
+       2513  2.0 Hub
        2514  USB 2.0 Hub
        2517  Hub
        2524  USB MultiSwitch Hub
@@ -1789,6 +1836,7 @@
        5220  Rio Nitrus MP3 Player
        5221  Rio Eigen
 045b  Hitachi, Ltd
+       0053  RX610 RX-Stick
 045d  Nortel Networks, Ltd
 045e  Microsoft Corp.
        0007  SideWinder Game Pad
@@ -2052,6 +2100,7 @@
        0006  LCD Tablet (12x9)
        0008  Tablet (3x2.25)
 0461  Primax Electronics, Ltd
+       0010  HP Keyboard
        0300  G2-300 Scanner
        0301  G2E-300 Scanner
        0302  G2-300 #2 Scanner
@@ -2096,6 +2145,7 @@
        4d03  Kensington Mouse-in-a-box
        4d04  Mouse
        4d06  Balless Mouse (HID)
+       4d0f  HP Optical Mouse
        4d15  Dell Optical Mouse
        4d17  Optical Mouse
        4d20  HP Optical Mouse
@@ -2317,6 +2367,7 @@
        c050  RX 250 Optical Mouse
        c051  G3 (MX518) Optical Mouse
        c053  Laser Mouse
+       c054  Bluetooth mini-receiver
        c058  M115 Mouse
        c05a  Optical Mouse M90
        c05b  M-U0004 810-001317 [B110 Optical USB Mouse]
@@ -2366,6 +2417,7 @@
        c22b  Gaming Keyboard G110 G-keys
        c22d  G510 Gaming Keyboard
        c22e  G510 Gaming Keyboard onboard audio
+       c246  Gaming Mouse G300
        c281  WingMan Force
        c283  WingMan Force 3D
        c285  WingMan Strike Force 3D
@@ -2575,6 +2627,7 @@
        2076  GoGear Aria
        2079  GoGear Opus
        2088  MCE IR Receiver with ALS- Spinel plus for ASUS
+       209e  PTA01 Wireless Adapter
        20b6  GoGear Vibe
        20e3  GoGear Raga
        262c  SPC230NC Webcam
@@ -2737,6 +2790,7 @@
        2018  BioSimKey
        2302  Portable Flash Device (PFD)
        3744  STLINK Pseudo disk
+       3747  ST Micro Connect Lite
        3748  ST-LINK/V2
        4810  ISDN adapter
        481d  BT Digital Access adapter
@@ -2761,12 +2815,15 @@
        d00e  Rollei Compactline (Video Mode)
        e000  T-Com TC 300
        e003  Pirelli DP-L10
+       e00d  Broadcom Bluetooth 2.1 Device
        e00f  Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter]
        e016  Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]
        e02c  Atheros AR5BBU12 Bluetooth Device
 048a  S-MOS Systems, Inc.
 048c  Alps Electric Ireland, Ltd
 048d  Integrated Technology Express, Inc.
+       1336  SD/MMC Cardreader
+       1345  Multi Cardreader
        9009  Zolid HD DVD Maker
        9135  Zolid Mini DVB-T Stick
 048f  Eicon Tech.
@@ -3257,6 +3314,7 @@
        26b0  MF4600 series
        26b4  MF4010 series
        26b5  MF4200 series
+       2737  MF4410
        3041  PowerShot S10
        3042  CanoScan FS4000US Film Scanner
        3043  PowerShot S20
@@ -3326,7 +3384,7 @@
        309a  PowerShot A80
        309b  Digital IXUS (ptp)
        309c  PowerShot S1 IS
-       309d  Camera
+       309d  Powershot Pro 1
        309f  Camera
        30a0  Camera
        30a1  Camera
@@ -3358,18 +3416,23 @@
        30ef  EOS 350D (ptp)
        30f0  PowerShot S2 IS (PTP mode)
        30f2  Digital IXUS 700 (normal mode) / Digital IXUS 700 (PTP mode) / IXY Digital 600 (normal mode) / PowerShot SD500 (normal mode) / PowerShot SD500 (PTP mode)
+       30f4  PowerShot SD30 / Ixus iZoom / IXY DIGITAL L3
        30f6  SELPHY CP400
        30f8  Powershot A430
        30f9  PowerShot A410 (PTP mode)
+       30fa  PowerShot S80
        30fc  PowerShot A620 (PTP mode)
        30fd  PowerShot A610 (normal mode)/PowerShot A610 (PTP mode)
        30fe  Digital IXUS 65 (PTP mode)/PowerShot SD630 (PTP mode)
        30ff  Digital IXUS 55 (PTP mode)/PowerShot SD450 (PTP mode)
+       3100  PowerShot TX1
        310b  SELPHY CP600
        310e  Digital IXUS 50 (PTP mode)
        3110  EOS Digital Rebel XTi
-       3116  Digital IXUS 750 (PTP mode)
+       3116  Digital IXUS 750 / PowerShot SD550 (PTP mode)
        3117  PowerShot A700
+       3119  PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS
+       311b  PowerShot A540
        312d  Elura 100
        3138  PowerShot A710 IS
        3147  EOS 1Ds Mark III
@@ -3384,17 +3447,39 @@
        3184  Digital IXUS 80 IS (PTP mode)
        3192  PowerShot SX110 IS
        319a  EOS 7D
+       31ad  PowerShot E1
        31bc  PowerShot D10
        31bf  PowerShot A480
        31c0  PowerShot SX200 IS
        31e5  Digital IXUS 200 IS
        31ee  SELPHY ES40
        31ef  PowerShot A495
+       31f1  PowerShot A3100 IS / PowerShot A3150 IS
+       31f2  PowerShot A3000 IS
        31f3  PowerShot Digital ELPH SD1400 IS
+       31f4  PowerShot SD1300 IS / IXUS 105
+       31f5  Powershot SD3500 IS / IXUS 210 IS
+       31f6  PowerShot SX210 IS
+       31f7  Powershot SD4000 IS / IXUS 300 HS / IXY 30S
+       31f8  Powershot SD4500 IS / IXUS 1000 HS / IXY 50S
        31ff  Digital IXUS 55
        3210  Powershot SX30 IS
+       3211  PowerShot SX130 IS
+       3212  Powershot S95
        3214  SELPHY CP800
+       3218  EOS 600D / Rebel T3i (ptp)
+       3223  PowerShot A3300 IS
+       3224  PowerShot A3200 IS
+       3226  PowerShow A800
+       3228  PowerShot SX230 HS
        3229  IXUS 220 HS
+       322a  PowerShot A2200
+       322b  Powershot A1200
+       3238  PowerShot SX40 HS
+       323f  PowerShot A810
+       3243  PowerShot A4000 IS
+       3244  PowerShot SX260 HS
+       3245  PowerShot SX240 HS
 04aa  DaeWoo Telecom, Ltd
 04ab  Chromatic Research
 04ac  Micro Audiometrics Corp.
@@ -3463,8 +3548,10 @@
        040f  D200 (mass storage mode)
        0410  D200 (ptp)
        0413  D40 (mass storage mode)
+       041e  D60 digital camera (mass storage mode)
        0422  D700 (ptp)
        0425  D300S
+       042a  D800 (ptp)
        0f03  PD-10 Wireless Printer Adapter
        4000  Coolscan LS 40 ED
        4001  LS 50 ED/Coolscan V ED
@@ -3551,46 +3638,56 @@
        0005  Printer
        0006  Printer
        0007  Printer
-       0101  Perfection 636
+       0101  GT-7000U [Perfection 636]
        0102  GT-2200
-       0103  Perfection 610
-       0104  Perfection 1200
-       0105  StylusScan 2000
+       0103  GT-6600U [Perfection 610]
+       0104  GT-7600UF [Perfection 1200U/1200U Photo]
+       0105  Stylus Scan 2000
        0106  Stylus Scan 2500
-       0107  Expression 1600U
-       0109  Expression 1640 XL
-       010a  Perfection 1640SU
-       010b  Perfection 1240
-       010c  Perfection 640
-       010e  Perfection 1680
-       010f  Perfection 1250
-       0110  Perfection 1650
-       0112  Perfection 2450
+       0107  ES-2000 [Expression 1600U]
+       0108  CC-700
+       0109  ES-8500 [Expression 1640 XL]
+       010a  GT-8700/GT-8700F [Perfection 1640SU/1640SU PHOTO]
+       010b  GT-7700U [Perfection 1240U]
+       010c  GT-6700U [Perfection 640]
+       010d  CC-500L
+       010e  ES-2200 [Perfection 1680]
+       010f  GT-7200U [Perfection 1250/1250 PHOTO]
+       0110  GT-8200U/GT-8200UF [Perfection 1650/1650 PHOTO]
+       0112  GT-9700F [Perfection 2450 PHOTO]
        0114  Perfection 660
-       0116  Perfection 3170 (GT-9400)
-       0118  Perfection 4180 (GF-F600)
-       0119  Perfection 4490 Photo
-       011a  1000 ICS
-       011b  Perfection 2400 Photo
-       011c  Perfection 3200
-       011d  Perfection 1260 Photo
-       011e  Perfection 1660 Photo
-       011f  Perfection 1670
-       0120  Perfection 1270 scanner
-       0121  Perfection 2480/2580 Photo [GT-F500]
-       0122  Perfection 3590 scanner
-       0126  GT-15000 (ES-7000)
-       0128  Perfection 4870 (GT-X700)
-       0129  Expression 10000XL (ES-10000G)
-       012a  Perfection 4990 Photo scanner
-       012b  GT-2500 (ES-H300)
-       012c  Perfection V700 Photo (GT-X900)
-       012d  Perfection V10/V100 (GT-S600/F650)
-       012f  Perfection V350 (GT-F700)
-       0130  Perfection V500 (GT-X770)
-       0131  Perfection V300
-       0136  GT-S80 (ES-D400)
-       0137  GT-S50 (ES-D200)
+       0116  GT-9400UF [Perfection 3170]
+       0118  GT-F600 [Perfection 4180]
+       0119  GT-X750 [Perfection 4490 Photo]
+       011a  CC-550L [1000 ICS]
+       011b  GT-9300UF [Perfection 2400 PHOTO]
+       011c  GT-9800F [Perfection 3200]
+       011d  GT-7300U [Perfection 1260/1260 PHOTO]
+       011e  GT-8300UF [Perfection 1660 PHOTO]
+       011f  GT-8400UF [Perfection 1670/1670 PHOTO]
+       0120  GT-7400U [Perfection 1270]
+       0121  GT-F500/GT-F550 [Perfection 2480/2580 PHOTO]
+       0122  GT-F520/GT-F570 [Perfection 3590 PHOTO]
+       0126  ES-7000H [GT-15000]
+       0128  GT-X700 [Perfection 4870]
+       0129  ES-10000G [Expression 10000XL]
+       012a  GT-X800 [Perfection 4990 PHOTO]
+       012b  ES-H300 [GT-2500]
+       012c  GT-X900 [Perfection V700/V750 Photo]
+       012d  GT-F650 [GT-S600/Perfection V10/V100]
+       012e  GT-F670 [Perfection V200 Photo]
+       012f  GT-F700 [Perfection V350]
+       0130  GT-X770 [Perfection V500]
+       0131  GT-F720 [GT-S620/Perfection V30/V300 Photo]
+       0133  GT-1500 [GT-D1000]
+       0135  GT-X970
+       0136  ES-D400 [GT-S80]
+       0137  ES-D200 [GT-S50]
+       0138  ES-H7200 [GT-20000]
+       013a  GT-X820 [Perfection V600 Photo]
+       0142  GT-F730 [GT-S630/Perfection V33/V330 Photo]
+       0143  GT-S55
+       0144  GT-S85
        0202  Receipt Printer M129C
        0401  CP 800 Digital Camera
        0402  PhotoPC 850z
@@ -3598,38 +3695,38 @@
        0509  JVC PIX-MC10
        0601  Stylus Photo 875DC Card Reader
        0602  Stylus Photo 895 Card Reader
-       0801  Stylus CX5200/CX5400/CX6600
-       0802  Stylus CX3200
+       0801  CC-600PX [Stylus CX5200/CX5400/CX6600]
+       0802  CC-570L [Stylus CX3100/CX3200]
        0803  Printer (Composite Device)
        0804  Storage Device
-       0805  Stylus CX6400
-       0806  Stylus Photo RX600/610
+       0805  Stylus CX6300/CX6400
+       0806  PM-A850 [Stylus Photo RX600/610]
        0807  Stylus Photo RX500/510
-       0808  Stylus CX5200
+       0808  Stylus CX5200/CX5300/CX5400
        0809  Storage Device
-       080a  Storage Device
-       080c  ME100
+       080a  F-3200
+       080c  ME100 [Stylus CX1500]
        080d  Stylus CX4500/4600
-       080e  CX-3500/3600/3650 MFP
-       080f  Stylus Photo RX425 scanner
-       0810  Stylus Photo RX700 (PM-A900)
-       0811  Stylus Photo RX620 all-in-one
+       080e  PX-A550 [CX-3500/3600/3650 MFP]
+       080f  Stylus Photo RX420/RX425/RX430
+       0810  PM-A900 [Stylus Photo RX700]
+       0811  PM-A870 [Stylus Photo RX620/RX630]
        0812  MFP Composite Device
        0813  Stylus CX6500/6600
-       0814  (PM-A700)
-       0815  AcuLaser CX11 (LP-A500)
+       0814  PM-A700
+       0815  LP-A500 [AcuLaser CX1]
        0816  Printer (Composite Device)
-       0817  (LP-M5500)
+       0817  LP-M5500/LP-M5500F
        0818  Stylus CX3700/CX3800/DX3800
-       0819  Stylus CX4700/CX4800/DX4800 (PX-A750)
-       081a  Stylus Photo RX520/RX530 (PM-A750)
+       0819  PX-A650 [Stylus CX4700/CX4800/DX4800/DX4850]
+       081a  PM-A750 [Stylus Photo RX520/RX530]
        081b  MFP Composite Device
-       081c  Stylus Photo RX640/RX650 (PM-A890)
-       081d  (PM-A950)
+       081c  PM-A890 [Stylus Photo RX640/RX650]
+       081d  PM-A950
        081e  MFP Composite Device
        081f  Stylus CX7700/7800
-       0820  CX4200 MP scanner
-       0821  MFP Composite Device
+       0820  Stylus CX4100/CX4200/DX4200
+       0821  Stylus CX5700F/CX5800F
        0822  Storage Device
        0823  MFP Composite Device
        0824  Storage Device
@@ -3665,6 +3762,7 @@
        0851  Stylus SX410
        0856  Stylus SX515W
        085c  Stylus SX125
+       087b  Stylus Photo PX730WD (Printer, Scanner, Copier)
 04b9  Rainbow Technologies, Inc.
        0300  SafeNet USB SuperPro/UltraPro
        1000  iKey 1000 Token
@@ -4248,7 +4346,9 @@
        5f02  NEXiO Sync
        5f03  NEXiO Sync
        5f04  NEXiO Sync
+       5f05  STORY Station 1TB
        6032  G2 Portable hard drive
+       60b3  M2 Portable Hard Drive
        60c4  M2 Portable Hard Drive USB 3.0
        6601  Mobile Phone
        6602  Galaxy
@@ -4286,7 +4386,9 @@
        684e  Wave (GT-S8500)
        685b  GT-I9100 Phone [Galaxy S II] (mass storage mode)
        685e  GT-I9100 Phone [Galaxy S II] (USB Debugging mode)
-       6860  GT-I9100 Phone [Galaxy S II]
+       6860  GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1]
+       6865  GT-I9300 Phone [Galaxy S III] (PTP mode)
+       6866  GT-I9300 Phone [Galaxy S III] (debugging mode)
        6875  GT-B3710 Standalone LTE device (Commercial)
        6876  GT-B3710 LTE Modem
        6877  Galaxy S
@@ -4380,12 +4482,15 @@
        b175  4-Port Hub
        b1aa  Webcam-101
        b1b4  Lenovo Integrated Camera
+       b1b9  Asus Integrated Webcam
        b1cf  Lenovo Integrated Camera
        b217  Lenovo Integrated Camera (0.3MP)
        b221  integrated camera
        b230  Integrated HP HD Webcam
+       b257  Lenovo Integrated Camera
        b26b  Sony Visual Communication Camera
        b272  Lenovo EasyCamera
+       b2b9  Lenovo Integrated Camera UVC
 04f3  Elan Microelectronics Corp.
        01a4  Wireless Keyboard
        0210  AM-400 Hama Optical Mouse
@@ -4588,6 +4693,7 @@
        01ea  DCP-7030
        01eb  MFC-7320
        01f4  MFC-5890CN
+       0223  DCP-365CN
        1000  Printer
        1002  Printer
        2002  PTUSB Printing
@@ -4724,7 +4830,9 @@
        0815  Nostromo n52 HID SpeedPad Mouse Wheel
        0826  ErgoFit Wireless Optical Mouse (HID)
        0980  HID UPS Battery
+       1004  F9L1004 802.11n Surf N300 XR Wireless Adapter [Realtek RTL8192CU]
        1102  F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CUS]
+       1103  F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573]
        1202  F5U120-PC Parallel Printer Port
        1203  F5U120-PC Serial Port
        2103  F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU]
@@ -4733,6 +4841,7 @@
        3201  F1DF102U/F1DG102U Flip KVM
        4050  ZD1211B
        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]
        7050  F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887]
@@ -4748,7 +4857,7 @@
        815c  F5D8053 N Wireless USB Adapter v3000 [Ralink RT2870]
        815f  F5D8053 N Wireless USB Adapter v6000 [Realtek RTL8192SU]
        825a  F5D8055 N+ Wireless Adapter v1000 [Ralink RT2870]
-       825b  F5D8055 N+ Wireless Adapter v2000 [Ralink RT3070]
+       825b  F5D8055 N+ Wireless Adapter v2000 [Ralink RT3072]
        845a  F7D2101 802.11n Surf & Share Wireless Adapter v1000 [Realtek RTL8192SU]
        905b  F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573]
        905c  F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573]
@@ -4756,6 +4865,7 @@
        935b  F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070]
        945a  F7D1101 v1 Basic Wireless Adapter [Realtek RTL8188SU]
        945b  F7D1101 v2 Basic Wireless Adapter [Ralink RT3370]
+       d321  Dynex DX-NUSB 802.11bgn Wireless Adapter
 050e  Neon Technology, Inc.
 050f  KC Technology, Inc.
        0001  Hub
@@ -5108,6 +5218,7 @@
        035c  NWZ-A726/A728/A729
        0382  Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)
        0385  Walkman NWZ-E436F
+       0387  Sony IC Recorder (P)
        03bc  Webbie HD - MHS-CM1
        03d3  DR-BT100CX
        03d5  PlayStation Move motion controller
@@ -5349,6 +5460,7 @@
        0003  Device Bay Controller
 056e  Elecom Co., Ltd
        0002  29UO Mouse
+       0072  Mouse
        200c  LD-USB/TX
        4002  Laneed 100Mbps Ethernet LD-USB/TX [pegasus]
        4005  LD-USBL/TX
@@ -5375,8 +5487,10 @@
        1253  Zoom V.92 Faxmodem
        1300  SoftK56 Data Fax Voice CARP
        1301  Modem Enumerator
+       1328  TrendNet TFM-561 modem
        2000  SoftGate 802.11 Adapter
        2002  SoftGate 802.11 Adapter
+       262a  tm5600 Video & Audio Grabber Capture
        8390  WinFast PalmTop/Novo TV Video
        8392  WinFast PalmTop/Novo TV Video
        cafe  AccessRunner ADSL Modem
@@ -5487,7 +5601,7 @@
        62ff  AVM Fritz!WLAN USB (in CD-ROM-mode)
        8401  Fritz!WLAN N [Atheros AR9001U]
        8402  Fritz!WLAN N 2.4 [Atheros AR9001U]
-       8403  Fritz!WLAN N v2 [Atheros AR7010]
+       8403  Fritz!WLAN N v2 [Atheros AR9271]
        84ff  AVM Fritz!WLAN USB N (in CD-ROM-mode)
 057d  Shark Multimedia, Inc.
 057e  Nintendo Co., Ltd
@@ -5659,6 +5773,7 @@
        0008  Fujifilm MemoryCard ReaderWriter
        0220  U2SCX SCSI Converter
        b000  REX-USB60
+       b020  REX-USB60F
 0585  FlashPoint Technology, Inc.
        0001  Digital Camera
        0002  Digital Camera
@@ -5688,9 +5803,12 @@
        3400  ZyAIR B-220 IEEE 802.11b Adapter
        3401  ZyAIR G-220 802.11bg
        3402  ZyAIR G-220F 802.11bg
+       3403  AG-200 802.11abg Wireless Adapter [Atheros AR5523]
        3407  G-200 v2 802.11bg
+       3408  G-260 802.11bg
        3409  AG-225H 802.11bg
        340a  M-202 802.11bg
+       340c  G-270S 802.11bg Wireless Adapter [Atheros AR5523]
        340f  G-220 v2 802.11bg
        3410  ZyAIR G-202 802.11bg
        3412  802.11bg
@@ -5699,9 +5817,11 @@
        3416  NWD-210N 802.11b/g/n-draft wireless adapter
        3417  NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG]
        3418  NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870]
+       3419  G-220 v3 802.11bg Wireless Adapter [ZyDAS ZD1211B]
        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]
+       343e  N220 802.11bgn Wireless Adapter
 0587  America Kotobuki Electronics Industries, Inc.
 0588  Sapien Design
 0589  Victron
@@ -5742,11 +5862,11 @@
        6360  Multimedia Card Reader
        6361  Multimedia Card Reader
        6362  Flash Card Reader/Writer
-       6364  AU6476 Card Reader Controller
+       6364  AU6477 Card Reader Controller
        6366  Multi Flash Reader
        6377  Multimedia Card Reader
        6386  Memory Card
-       6387  Transcend JetFlash Flash Drive
+       6387  Flash Drive
        6390  USB 2.0-IDE bridge
        9213  MacAlly Kbd Hub
        9215  AU9814 Hub
@@ -6014,11 +6134,13 @@
        129e  iPod Touch 4.Gen
        129f  iPad 2
        12a0  iPhone 4S
+       12a2  iPad 2 (3G; 64GB)
        1300  iPod Shuffle
        1301  iPod Shuffle 2.Gen
        1302  iPod Shuffle 3.Gen
        1303  iPod Shuffle 4.Gen
        1401  Modem
+       1402  Ethernet Adapter [A1277]
        8202  HCF V.90 Data/Fax Modem
        8203  Bluetooth HCI
        8204  Bluetooth HCI [Bluetooth 2.0 + EDR, built-in]
@@ -6042,9 +6164,15 @@
        8509  FaceTime HD Camera
        911c  Hub in A1082 [Cinema HD Display 23"]
        912f  Hub in 30" Cinema Display
+       9215  Studio Display 15"
+       9217  Studio Display 17"
+       9218  Cinema Display 23"
+       9219  Cinema Display 20"
        921c  A1082 [Cinema HD Display 23"]
+       921e  Cinema Display 24"
        9221  30" Cinema Display
        9227  Thunderbolt Display
+       9232  Cinema HD Display 30"
        ffff  Bluetooth in DFU mode - Driver
 05ad  Y.C. Cable U.S.A., Inc.
 05ae  Synopsys, Inc.
@@ -6143,6 +6271,7 @@
        1810  Pavilion Webcam [R5U870]
        1812  Pavilion Webcam
        1814  HD Webcam
+       1820  Integrated Webcam
        1830  Visual Communication Camera VGP-VCC2 [R5U870]
        1832  Visual Communication Camera VGP-VCC3 [R5U870]
        1833  Visual Communication Camera VGP-VCC2 [R5U870]
@@ -6160,6 +6289,7 @@
        18b0  Sony Vaio Integrated Webcam
        18b1  Sony Vaio Integrated Webcam
        18b3  Sony Vaio Integrated Webcam
+       18b5  Sony Vaio Integrated Webcam
        2201  RDC-7 Camera
        2202  Caplio RR30
        2203  Caplio 300G
@@ -6467,6 +6597,7 @@
        0716  USB 2.0 Multislot Card Reader/Writer
        0717  All-in-1 Card Reader
        0718  IDE/SATA Adapter
+       0719  SATA adapter
        0723  GL827L SD/MMC/MS Flash Card Reader
        0726  SD Card Reader
        0727  microSD Reader/Writer
@@ -6571,6 +6702,7 @@
        1006  Japanese Keyboard - 260U
        2101  Keyboard
        2231  KSK-6001 UELX Keyboard
+       2270  Gigabyte K8100 Aivia Gaming Keyboard
        5811  ACK-571U Wireless Keyboard
        5903  Japanese Keyboard - 595U
        6001  SolidTek USB 2p HUB
@@ -6607,6 +6739,7 @@
 061b  Promptus Communications, Inc.
 061c  Act Labs, Ltd
 061d  Quatech, Inc.
+       c020  SSU-100
 061e  Nissei Electric Co.
        0001  nissei 128DE-USB -
        0010  nissei 128DE-PNA -
@@ -7236,17 +7369,17 @@
        0009  Monitor Control
 06ca  Newer Technology, Inc.
 06cb  Synaptics, Inc.
-       0001  HID Device
-       0002  HID Device
-       0003  HID Device
+       0001  TouchPad
+       0002  Integrated TouchPad
+       0003  cPad
        0005  Touchpad/FPS
-       0006  HID Device
-       0007  HID Device
-       0008  HID Device
+       0006  TouchScreen
+       0007  USB Styk
+       0008  WheelPad
        0009  Composite TouchPad and TrackPoint
        000e  HID Device
-       0010  Composite Human Interface Device
-       0013  Human Interface Device
+       0010  Wireless TouchPad
+       0013  DisplayPad
 06cc  Terayon Communication Systems
        0101  Cable Modem
        0102  Cable Modem
@@ -7288,6 +7421,8 @@
        012a  USA-49Wlc serial adapter
        0201  UIA-10 Digital Media Remote [Cypress AN2131SC]
        0202  UIA-11 Digital Media Remote
+06ce  Contec
+       8311  COM-1(USB)H
 06cf  SpheronVR AG
        1010  PanoCam 10
        1012  PanoCam 12/12X
@@ -7349,6 +7484,7 @@
        a191  Instant VideoXpress
        a337  Mini DigitalTV
        a701  DVD Xpress
+       a708  saa7114H video input card (Instant VideoMPX)
        b337  Mini DigitalTV
        b701  DVD Xpress B
 06e4  Alcatel Microelectronics
@@ -7714,6 +7850,7 @@
        0005  Cyber Power UPS
        0501  CP1500 AVR UPS
 0765  X-Rite, Inc.
+       5001  Huey PRO Colorimeter
        d094  X-Rite DTP94 [Quato Silver Haze Pro]
 0766  Jess-Link Products Co., Ltd
        0204  TopSpeed Cyberlink Remote Control
@@ -7891,11 +8028,13 @@
        00b3  DVD Multi-plus unit LDR-H443U2
        0105  LAN-TX/U1H2 10/100 Ethernet Adapter [pegasus II]
        010c  Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter
+       0160  LAN-GTJ/U2A
        0162  LAN-WN22/U2 Wireless LAN Adapter
        0163  LAN-WN12/U2 Wireless LAN Adapter
        0164  LAN-W150/U2M Wireless LAN Adapter
        0166  LAN-W300N/U2 Wireless LAN Adapter
        0168  LAN-W150N/U2 Wireless LAN Adapter
+       0170  LAN-W300AN/U2 Wireless LAN Adapter
 078b  Happ Controls, Inc.
        0010  Driving UGCI
        0020  Flying UGCI
@@ -7963,7 +8102,9 @@
        0018  Wireless LAN USB-11 mini 2
        001a  ULUSB-11 Key
        001c  CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887]
+       002e  CG-WLUSB2GPX [Ralink RT2571W]
        002f  CG-WLUSB2GNL
+       0031  CG-WLUSB2GS 802.11bg [Atheros AR5523]
        003c  CG-WLUSB2GNL
        003f  CG-WLUSB300AGN
        0041  CG-WLUSB300GNS
@@ -8124,6 +8265,8 @@
 07bd  Webgear, Inc.
 07be  Veridicom
 07c0  Code Mercenaries Hard- und Software GmbH
+       1113  JoyWarrior24F8
+       1116  JoyWarrior24F14
        1121  The Claw
        1500  IO-Warrior 40
        1501  IO-Warrior 24
@@ -8303,11 +8446,12 @@
        3a0f  DWA-130 802.11n Wireless N Adapter(rev.D) [Atheros AR9170+AR9102]
        3a10  DWA-126 802.11n Wireless Adapter [Atheros AR9271]
        3b01  AirPlus G DWL-G122 Wireless Adapter(rev.D) [Marvell 88W8338+88W8010]
-       3b10  RangeBooster N Adapter
+       3b10  DWA-142 RangeBooster N Adapter [Marvell 88W8362+88W8060]
        3b11  DWA-130 802.11n Wireless N Adapter(rev.A1) [Marvell 88W8362+88W8060]
        3c03  AirPlus G DWL-G122 Wireless Adapter(rev.C1) [Ralink RT2571W]
        3c04  WUA-1340
        3c05  EH103 Wireless G Adapter
+       3c06  DWA-111 802.11bg Wireless Adapter [Ralink RT2571W]
        3c07  DWA-110 Wireless G Adapter(rev.A1) [Ralink RT2571W]
        3c09  DWA-140 RangeBooster N Adapter(rev.B1) [Ralink RT2870]
        3c0a  DWA-140 RangeBooster N Adapter(rev.B2) [Ralink RT3072]
@@ -8379,7 +8523,8 @@
 0802  Mako Technologies, LLC
 0803  Zoom Telephonics, Inc.
        1300  V92 Faxmodem
-       4310  Wireless-G
+       4310  4410a Wireless-G Adapter [Intersil ISL3887]
+       4410  4410b Wireless-G Adapter [ZyDAS ZD1211B]
        5241  Cable Modem
        5551  DSL Modem
        9700  2986L FaxModem
@@ -8525,7 +8670,7 @@
        b522  SMCWUSBS-N2 EZ Connect N Wireless Adapter [Ralink RT2870]
        bb01  BlueExpert Bluetooth Device
        c003  802.11b Wireless Adapter
-       c501  Zoom Wireless-G
+       c501  Zoom 4410 Wireless-G [Intersil ISL3887]
        c561  802.11a/g Wireless Adapter
        d522  Speedport W 102 Stick IEEE 802.11n USB 2.0 Adapter
        e501  ZD1211B
@@ -8563,6 +8708,7 @@
        9001  WN111(v2) RangeMax Next Wireless [Atheros AR9170+AR9101]
        9010  WNDA3100v1 802.11abgn [Atheros AR9170+AR9104]
        9011  WNDA3100v2 802.11abgn [Broadcom BCM4323]
+       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]
        9030  WNA1100 Wireless-N 150 [Atheros AR9271]
@@ -9275,6 +9421,7 @@
        1624  DataTraveler G2 4GB Pen Drive
        1625  DataTraveler 101 II
        162a  DataTraveler 112 4GB Pen Drive
+       1642  DT101 G2
        1643  DataTraveler G3 4GB
        1653  Data Traveler 100 G2 8 GiB
 0954  RPM Systems Corp.
@@ -9284,6 +9431,8 @@
 0957  Agilent Technologies, Inc.
        0200  E-Video DC-350 Camera
        0202  E-Video DC-350 Camera
+       0518  82357B GPIB Interface
+       1745  Test and Measurement Device (IVI)
 0958  CompuLink Research, Inc.
 0959  Cologne Chip AG
        2bd0  Intelligent ISDN (Ver. 3.60.04)
@@ -9318,6 +9467,8 @@
 097b  Knudsen Engineering, Ltd
 097c  Marunix Co., Ltd
 097d  Rosun Technologies, Inc.
+097e  Biopac Systems Inc.
+       0035  MP35 v1.0
 097f  Barun Electronics Co., Ltd
 0981  Oak Technology, Ltd
 0984  Apricorn
@@ -9408,6 +9559,7 @@
 09da  A4 Tech Co., Ltd
        0006  Optical Mouse WOP-35 / Trust 450L Optical Mouse
        000a  Optical Mouse Opto 510D
+       000e  X-F710F Optical Mouse 3xFire Gaming Mouse
        0018  Trust Human Interface Device
        001a  Wireless Mouse & RXM-15 Receiver
        002a  Wireless Optical Mouse NB-30
@@ -9859,8 +10011,9 @@
        1060  OPEN NT1 Plus II
 0acc  Koga Electronics Co.
 0acd  ID Tech
-       0401  ID TECH Spectrum III Hybrid Smartcard Reader
-       0630  ID TECH Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC
+       0300  IDT1221U RS-232 Adapter
+       0401  Spectrum III Hybrid Smartcard Reader
+       0630  Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC
 0ace  ZyDAS
        1201  ZD1201 802.11b
        1211  ZD1211 802.11g
@@ -9967,10 +10120,14 @@
        1774  Gobi Wireless Modem (QDL mode)
        1776  Gobi Wireless Modem
        1779  My Cinema U3100 Mini Plus [AF9035A]
-       1784  USB-N13 802.11n Network Adapter [Ralink RT3072]
+       1784  USB-N13 802.11n Network Adapter (rev. A1) [Ralink RT3072]
        1786  USB-N10 802.11n Network Adapter [Realtek RTL8188SU]
        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)
+       17a1  Eee Note EA800 (mass storage mode)
+       17ab  USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]
        6101  Cable Modem
        620a  Remote NDIS Device
        b700  Broadcom Bluetooth 2.1
@@ -10022,7 +10179,7 @@
        1602  ZyXEL ZyAIR B200 802.11b Adapter
        1612  AIR.Mate 2@net 802.11b Adapter
        1613  802.11b Wireless LAN Adapter
-       1620  Allnet USB 2.0 Wireless Network Adapter
+       1620  Allnet Wireless Network Adapter [Envara WiND512]
        1630  QuickWLAN 802.11bg
        5630  802.11bg
        6630  ZD1211
@@ -10035,6 +10192,7 @@
        0011  Crossam2+USB IR commander
 0b43  Play.com, Inc.
        0003  PS2 Controller Converter
+       0005  GameCube Adaptor
 0b47  Sportbug.com, Inc.
 0b48  TechnoTrend AG
        1003  Technotrend/Hauppauge USB-Nova
@@ -10170,7 +10328,7 @@
        0302  U10H010 802.11b Wireless Adapter [Intersil PRISM 3]
        6098  USB Cable Modem
 0bb3  Ofuji Technology
-0bb4  High Tech Computer Corp.
+0bb4  HTC (High Tech Computer Corp.)
        00ce  mmO2 XDA GSM/GPRS Pocket PC
        00cf  SPV C500 Smart Phone
        0a01  PocketPC Sync
@@ -10346,6 +10504,7 @@
        0c13  Diamond
        0c1f  Sony Ericsson XPERIA X1
        0c5f  Snap
+       0c86  Sensation
        0c87  Desire (debug)
        0c8d  EVO 4G (debug)
        0c91  Vision
@@ -10374,8 +10533,10 @@
        2000  Storage Adapter V3 (TPP)
        2200  FreeAgent Go FW
        2300  Expansion Portable
+       3332  Expansion
        5021  FreeAgent GoFlex USB 2.0
        5031  FreeAgent GoFlex USB 3.0
+       50a5  FreeAgent GoFlex Desk USB 3.0
 0bc3  IPWireless, Inc.
        0001  UMTS-TDD (TD-CDMA) modem
 0bc4  Microcube Corp.
@@ -10445,6 +10606,7 @@
        8187  RTL8187 Wireless Adapter
        8189  RTL8187B Wireless 802.11g 54Mbps Network Adapter
        8192  RTL8192U 802.11n Wireless Adapter
+       8193  RTL8192DU 802.11an WLAN Adapter
        8197  RTL8187B Wireless Adapter
        8198  RTL8187B Wireless Adapter
 0bdb  Ericsson Business Mobile Networks BV
@@ -10468,6 +10630,7 @@
 0be6  Dong Guan Humen Wonderful Wire Cable Factory
 0bed  Silicon Labs
        1100  MEI (TM) Cashflow-SC Bill/Voucher Acceptor
+       1101  Series 2000 Combo Acceptor
 0bee  LTK Industries, Ltd
 0bef  Way2Call Communications
 0bf0  Pace Micro Technology PLC
@@ -10714,6 +10877,7 @@
        641d  1.3 MPixel Integrated Webcam
        6480  Sonix 1.3 MP Laptop Integrated Webcam
        64bd  Sony Visual Communication Camera
+       7402  TEMPerHUM Temperature & Humidity Sensor
        8000  DC31VC
        8006  Dual Mode Camera (8006 VGA)
        800a  Vivitar Vivicam3350B
@@ -10728,7 +10892,57 @@
 0c4c  Needham's Electronics
        0021  EMP-21 Universal Programmer
 0c52  Sealevel Systems, Inc.
-       2101  Serial Converter
+       2101  SeaLINK+232
+       2102  SeaLINK+485
+       2103  SeaLINK+232I
+       2104  SeaLINK+485I
+       2211  SeaPORT+2/232 (Port 1)
+       2212  SeaPORT+2/485 (Port 1)
+       2213  SeaPORT+2 (Port 1)
+       2221  SeaPORT+2/232 (Port 2)
+       2222  SeaPORT+2/485 (Port 2)
+       2223  SeaPORT+2 (Port 2)
+       2411  SeaPORT+4/232 (Port 1)
+       2412  SeaPORT+4/485 (Port 1)
+       2413  SeaPORT+4 (Port 1)
+       2421  SeaPORT+4/232 (Port 2)
+       2422  SeaPORT+4/485 (Port 2)
+       2423  SeaPORT+4 (Port 2)
+       2431  SeaPORT+4/232 (Port 3)
+       2432  SeaPORT+4/485 (Port 3)
+       2433  SeaPORT+4 (Port 3)
+       2441  SeaPORT+4/232 (Port 4)
+       2442  SeaPORT+4/485 (Port 4)
+       2443  SeaPORT+4 (Port 4)
+       2811  SeaLINK+8/232 (Port 1)
+       2812  SeaLINK+8/485 (Port 1)
+       2813  SeaLINK+8 (Port 1)
+       2821  SeaLINK+8/232 (Port 2)
+       2822  SeaLINK+8/485 (Port 2)
+       2823  SeaLINK+8 (Port 2)
+       2831  SeaLINK+8/232 (Port 3)
+       2832  SeaLINK+8/485 (Port 3)
+       2833  SeaLINK+8 (Port 3)
+       2841  SeaLINK+8/232 (Port 4)
+       2842  SeaLINK+8/485 (Port 4)
+       2843  SeaLINK+8 (Port 4)
+       2851  SeaLINK+8/232 (Port 5)
+       2852  SeaLINK+8/485 (Port 5)
+       2853  SeaLINK+8 (Port 5)
+       2861  SeaLINK+8/232 (Port 6)
+       2862  SeaLINK+8/485 (Port 6)
+       2863  SeaLINK+8 (Port 6)
+       2871  SeaLINK+8/232 (Port 7)
+       2872  SeaLINK+8/485 (Port 7)
+       2873  SeaLINK+8 (Port 7)
+       2881  SeaLINK+8/232 (Port 8)
+       2882  SeaLINK+8/485 (Port 8)
+       2883  SeaLINK+8 (Port 8)
+       9020  SeaLINK+422
+       a02a  SeaLINK+8 (Port 1+2)
+       a02b  SeaLINK+8 (Port 3+4)
+       a02c  SeaLINK+8 (Port 5+6)
+       a02d  SeaLINK+8 (Port 7+8)
 0c53  ViewPLUS, Inc.
 0c54  Glory, Ltd
 0c55  Spectrum Digital, Inc.
@@ -10749,10 +10963,13 @@
 0c65  Eminence Enterprise Co., Ltd
 0c66  Rexon Electronics Corp.
 0c67  Concept Telecom, Ltd
+0c6c  JETI Technische Instrumente GmbH
+       04b2  Specbos 1201
 0c70  MCT Elektronikladen
        0000  USB08 Development board
 0c72  PEAK System
        000c  PCAN-USB
+       000d  PCAN Pro
 0c74  Optronic Laboratories Inc.
        0002  OL 700-30 Goniometer
 0c76  JMTek, LLC.
@@ -10875,6 +11092,7 @@
        0077  Aureon Dual USB
        0078  Cinergy T XXS
        0086  Cinergy Hybrid XE
+       008e  Cinergy HTC XS
        0097  Cinergy T RC MKII
        0099  AfaTech 9015 [Cinergy T Stick Dual]
        00a5  Cinergy Hybrid Stick
@@ -11046,7 +11264,7 @@
 0d61  Meilu Electronics (Shenzhen) Co., Ltd
 0d62  Darfon Electronics Corp.
        0003  Smartcard Reader
-       0004  Filter Driver
+       0004  Keyboard
        001c  Benq X120 Internet Keyboard Pro
        0306  M530 Mouse
        0800  Magic Wheel
@@ -11377,11 +11595,15 @@
        0045  WL-353 Wireless USB Adapter 150N Nano
        0047  WL-352v1 Wireless USB Adapter 300N 002
        0048  WL-349v1 Wireless Adapter 150N 002 [Ralink RT3070]
+       0049  WL-356 Wireless Adapter 300N
        004a  WL-358v1 Wireless Micro USB Adapter 300N X3 002
        004b  WL-349v3 Wireless Micro Adapter 150N X1 [Realtek RTL8192SU]
        004c  WL-352 802.11n Adapter [Realtek RTL8191SU]
        0050  WL-349v4 Wireless Micro Adapter 150N X1 [Ralink RT3370]
+       0056  LN-031 10/100/1000 Ethernet Adapter
        005d  WLA-2000 v1.001 WLAN [RTL8191SU]
+       0060  WLA-4000 802.11bgn [Ralink RT3072]
+       0062  WLA-5000 802.11abgn [Ralink RT3572]
        061c  LN-028 Network USB 2.0 Adapter
        21f4  44 St Bluetooth Device
        2200  Sitecom bluetooth2.0 class 2 dongle CN-512
@@ -11470,6 +11692,7 @@
 0e3b  Mansella, Ltd
 0e41  Line6, Inc.
        4147  TonePort GX
+       4156  POD HD Desktop
        4250  BassPODxt
        4252  BassPODxt Pro
        4642  BassPODxt Live
@@ -11486,6 +11709,8 @@
        1097  Gamester Controller
        2390  Games Jtech Controller
        7288  funkey reader
+0e50  TechnoData Interware
+       0002  Matrixlock Dongle (HID)
 0e55  Speed Dragon Multimedia, Ltd
        110a  Tanic S110-SG1 + ISSC IS1002N [Slow Infra-Red (SIR) & Bluetooth 1.2 (Class 2) Adapter]
        110b  MS3303H USB-to-Serial Bridge
@@ -11506,6 +11731,7 @@
        0009  HWUN2 Hi-Gain Wireless-150N Adapter w/ Upgradable Antenna [Ralink RT2770]
        000b  HWDN2 Hi-Gain Wireless-150N Dish Adapter [Ralink RT2770]
        0013  HWUN3 Hi-Gain Wireless-N Adapter [Ralink RT3070]
+       0015  HWDN2 Rev. E Hi-Gain Wireless-150N Dish Adapter [Realtek RTL8191SU]
        0017  HAWNU1 Hi-Gain Wireless-150N Network Adapter with Range Amplifier [Ralink RT3070]
        0018  Wireless-N Network Adapter [Ralink RT2870]
        400b  UF100 10/100 Network Adapter
@@ -11800,6 +12026,7 @@
        00d4  C902 [MTP]
        00d9  C702 Phone
        0112  W995 Walkman Phone
+       0166  Xperia Mini Pro
        1010  WMC Modem
        10af  V640i Phone [PictBridge]
        10d4  C902 Phone [PictBridge]
@@ -11849,7 +12076,11 @@
        e12e  X10i Phone
        e133  Vivaz
        e14f  Xperia Arc/X12
+       e161  Xperia Ray
 0fcf  Dynastream Innovations, Inc.
+       1003  ANT Development Board
+       1004  ANT2USB
+       1006  ANT Development Board
 0fd0  Tulip Computers B.V.
 0fd1  Giant Electronics Ltd.
 0fd4  Tenovis GmbH & Co., KG
@@ -11978,6 +12209,7 @@
 1038  Ideazon, Inc.
        0100  Zboard
 1039  devolo AG
+       0824  1866 802.11bg [Texas Instruments TNETW1450]
        2140  dsl+ 1100 duo
 103d  Stanton
        0100  ScratchAmp
@@ -12047,6 +12279,7 @@
        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
@@ -12105,6 +12338,7 @@
        3701  Broadband Wireless modem
        3702  Pantech PX-500
        3714  PANTECH USB MODEM [UM175]
+       3716  UMW190 Modem
        3eb4  Packet Service Diagnostic Serial Port (WDM)
        4101  Packet Service Diagnostic Serial Port (WDM)
        4102  Packet Service
@@ -12208,11 +12442,20 @@
        80a9  CP210x to UART Bridge Controller
        80ca  ATM2400 Sensor Device
        813f  tams EasyControl
+       8149  West Mountain Radio Computerized Battery Analyzer
+       814a  West Mountain Radio RIGblaster P&P
+       814b  West Mountain Radio RIGtalk
        818a  Silicon Labs FM Radio Reference Design
+       81e8  Zephyr BioHarness
        8460  Sangoma Wanpipe VoiceTime
        8461  Sangoma U100
+       8477  Balluff RFID Reader
        86bc  C8051F34x AudioDelay [AD-340]
-       ea60  CP210x Composite Device
+       8789  C8051F34x Extender & EDID MGR [EMX-DVI]
+       ea60  CP210x UART Bridge / myAVR mySmartUSB light
+       ea61  CP210x UART Bridge
+       ea70  CP210x UART Bridge
+       ea80  CP210x UART Bridge
 10c5  Sanei Electric, Inc.
        819a  FM Radio
 10c6  Intec, Inc.
@@ -12472,7 +12715,8 @@
 1230  Chipidea-Microelectronica, S.A.
 1233  Denver Electronics
        5677  FUSB200 mp3 player
-1234  Unknown
+1234  Brain Actuated Technologies
+       0000  Neural Impulse Actuator Prototype 1.0 [NIA]
        ed02  Emotiv EPOC Developer Headset Wireless Dongle
 1235  Novation EMS
        0001  ReMOTE Audio/XStation
@@ -12490,6 +12734,8 @@
 124a  AirVast
        168b  PRISM3 WLAN Adapter
        4017  PC-Chips 802.11b Adapter
+       4023  WM168g 802.11bg Wireless Adapter [Intersil ISL3886]
+       4025  IOGear GWU513 v2 802.11bg Wireless Adapter [Intersil ISL3887]
 124b  Nyko (Honey Bee)
        4d01  Airflo EX Joystick
 124c  MXI - Memory Experts International, Inc.
@@ -12587,6 +12833,7 @@
 12d1  Huawei Technologies Co., Ltd.
        1001  E169/E620/E800 HSDPA Modem
        1003  E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem
+       1004  E220 (bis)
        1009  U120
        1010  ETS2252+ CDMA Fixed Wireless Terminal
        1035  U8120
@@ -12596,6 +12843,8 @@
        1406  E1750
        140b  EC1260 Wireless Data Modem HSD USB Card
        1446  E1552/E1800/E173 (HSPA modem)
+       14c9  K3770 3G Modem
+       14d1  K3770 3G Modem (Mass Storage Mode)
        14f1  Gobi 3000 HSPA+ Modem
        1501  Pulse
        1505  E398 LTE/UMTS/GSM Modem/Networkcard
@@ -12688,7 +12937,7 @@
        0401  G2CCD-S with Sony ICX285 CCD
        0402  G2CCD2
        0403  G2/G3CCD-I KAI CCD
-       0404  G2/G3CCD-F KAF CCD
+       0404  G2/G3/G4 CCD-F KAF CCD
        0410  G1-0400 CCD
        0411  G1-0800 CCD
        0412  G1-0300 CCD
@@ -12738,7 +12987,7 @@
 138e  Jungo LTD
        9000  Raisonance S.A. STM32 ARM evaluation board
 1390  TOMTOM B.V.
-       0001  GO 520 T/ONE XL (v9)
+       0001  GO 520 T/GO 630/ONE XL (v9)
 1391  IdealTEK, Inc.
        1000  URTC-1000
 1395  Sennheiser Communications
@@ -14745,6 +14994,14 @@
 2650  Electronics For Imaging, Inc. [hex]
 2659  Sundtek
        1101  TNT DVB-T/DAB/DAB+/FM
+       1201  FM Transmitter/Receiver
+       1202  MediaTV Analog/FM/DVB-T
+       1203  MediaTV Analog/FM/DVB-T MiniPCIe
+       1204  MediaTV Analog/FM/ATSC
+       1205  SkyTV Ultimate V
+       1206  MediaTV DVB-T MiniPCIe
+       1207  Sundtek HD Capture
+       1208  Sundtek SkyTV Ultimate III
 2730  Citizen
        200f  CT-S310 Label printer
 2735  DigitalWay

diff --git a/src/initscripts/init.d/minidlna b/src/initscripts/init.d/minidlna
new file mode 100755 (executable)
index 0000000..6823067
--- /dev/null
+++ b/src/initscripts/init.d/minidlna
@@ -0,0 +1,48 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/minidlna
+#
+# Description : minidlna - UPNP/DLNA streaming server
+#
+# Authors     : Michael Tremer <michael.tremer@ipfire.org>
+#
+# Version     : 01.00
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+       start)
+               boot_mesg "Starting minidlna..."
+               loadproc /usr/sbin/minidlna
+               ;;
+
+       stop)
+               boot_mesg "Stopping minidlna..."
+               killproc /usr/sbin/minidlna
+               ;;
+
+       reload)
+               boot_mesg "Reloading minidlna..."
+               reloadproc /usr/sbin/minidlna
+               ;;
+
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       status)
+               statusproc /usr/sbin/minidlna
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|reload|restart|status}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/minidlna

diff --git a/src/initscripts/init.d/network-vlans b/src/initscripts/init.d/network-vlans
new file mode 100755 (executable)
index 0000000..88733e6
--- /dev/null
+++ b/src/initscripts/init.d/network-vlans
@@ -0,0 +1,101 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2012 IPFire Team <info@ipfire.org>                         #
+#                                                                          #
+############################################################################
+
+CONFIG_FILE="/var/ipfire/ethernet/vlans"
+
+# Skip immediately if no configuration file has been found.
+[ -e "${CONFIG_FILE}" ] || exit 0
+
+eval $(readhash ${CONFIG_FILE})
+
+# This is start or stop.
+action=${1}
+
+for interface in green0 blue0 orange0; do
+       case "${interface}" in
+               green*)
+                       PARENT_DEV=${GREEN_PARENT_DEV}
+                       VLAN_ID=${GREEN_VLAN_ID}
+                       MAC_ADDRESS=${GREEN_MAC_ADDRESS}
+                       ;;
+               blue*)
+                       PARENT_DEV=${BLUE_PARENT_DEV}
+                       VLAN_ID=${BLUE_VLAN_ID}
+                       MAC_ADDRESS=${BLUE_MAC_ADDRESS}
+                       ;;
+               orange*)
+                       PARENT_DEV=${ORANGE_PARENT_DEV}
+                       VLAN_ID=${ORANGE_VLAN_ID}
+                       MAC_ADDRESS=${ORANGE_MAC_ADDRESS}
+                       ;;
+       esac
+
+       case "${action}" in
+               start)
+                       # Check if the interface does already exists.
+                       # If so, we skip creating it.
+                       if [ -d "/sys/class/net/${interface}" ]; then
+                               echo "Interface ${interface} already exists."
+                               continue
+                       fi
+
+                       # Check if the parent interface exists.
+                       if [ -z "${PARENT_DEV}" ] || [ ! -d "/sys/class/net/${PARENT_DEV}" ]; then
+                               echo "${interface}: Parent device is not set or does not exist: ${PARENT_DEV}"
+                               continue
+                       fi
+
+                       if [ -z "${VLAN_ID}" ]; then
+                               echo "${interface}: You did not set the VLAN ID."
+                               continue
+                       fi
+
+                       echo "Creating VLAN interface ${interface}..."
+                       vconfig add ${PARENT_DEV} ${VLAN_ID}
+                       ip link set ${PARENT_DEV}.${VLAN_ID} name ${interface}
+
+                       if [ -n "${MAC_ADDRESS}" ]; then
+                               ip link set ${interface} address ${MAC_ADDRESS}
+                       fi
+
+                       # Bring up the parent device.
+                       ip link set ${PARENT_DEV} up
+                       ;;
+
+               stop)
+                       if [ ! -e "/proc/net/vlan/${interface}" ]; then
+                               echo "${interface} is not a VLAN interface. Skipping."
+                               continue
+                       fi
+
+                       echo "Removing VLAN interface ${interface}..."
+                       ip link set ${interface} down
+                       vconfig rem ${interface}
+                       ;;
+               
+               *)
+                       echo "Invalid action: ${action}"
+                       exit 1
+                       ;;
+       esac
+done

diff --git a/src/paks/minidlna/install.sh b/src/paks/minidlna/install.sh
new file mode 100644 (file)
index 0000000..5080157
--- /dev/null
+++ b/src/paks/minidlna/install.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+[ -d /var/mp3 ] ||  ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 )
+
+start_service ${NAME}
+
+ln -svf ../init.d/minidlna /etc/rc.d/rc0.d/K00minidlna
+ln -svf ../init.d/minidlna /etc/rc.d/rc3.d/S99minidlna
+ln -svf ../init.d/minidlna /etc/rc.d/rc6.d/K00minidlna

diff --git a/src/paks/minidlna/uninstall.sh b/src/paks/minidlna/uninstall.sh
new file mode 100644 (file)
index 0000000..bc59838
--- /dev/null
+++ b/src/paks/minidlna/uninstall.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+remove_files
+rm -rf /etc/rc.d/rc*.d/*minidlna

diff --git a/src/paks/minidlna/update.sh b/src/paks/minidlna/update.sh
new file mode 100644 (file)
index 0000000..d5e6116
--- /dev/null
+++ b/src/paks/minidlna/update.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+./uninstall.sh
+./install.sh

diff --git a/src/patches/apcupsd-3.14.4-fix-gcc44.patch b/src/patches/apcupsd-3.14.4-fix-gcc44.patch
deleted file mode 100644 (file)
index 0052098..0000000
--- a/src/patches/apcupsd-3.14.4-fix-gcc44.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up apcupsd-3.14.5/src/apcaccess.c.gcc44 apcupsd-3.14.5/src/apcaccess.c
---- apcupsd-3.14.5/src/apcaccess.c.gcc44 2009-02-24 10:36:35.781325750 +0100
-+++ apcupsd-3.14.5/src/apcaccess.c 2009-02-24 10:38:12.416285478 +0100
-@@ -86,10 +86,10 @@ int main(int argc, char **argv)
-    }
- 
-    if (argc > 2) {                 /* assume host:port */
--      char *p;
-+      char *p = argv[2];
- 
--      host = argv[2];
--      p = strchr(host, ':');
-+      host = p;
-+      p = strchr(p, ':');
-       if (p) {
-          *p++ = 0;
-          port = atoi(p);