diff -ruN pciutils-3.1.4/ChangeLog pciutils-3.1.5/ChangeLog
--- pciutils-3.1.4/ChangeLog	2009-08-14 14:39:50.000000000 +0200
+++ pciutils-3.1.5/ChangeLog	2010-01-19 10:35:41.000000000 +0100
@@ -1,3 +1,25 @@
+2010-01-19  Martin Mares <mj@ucw.cz>
+
+	* Released as 3.1.5.
+
+	* Updated pci.ids to the today's snapshot of the database.
+
+	* When scanning extended capabilities, properly mask the lowest 2 bits,
+	  which are currently reserved. This avoids unaligned access errors on
+	  broken hardware (see tests/broken-ecaps).
+
+	* Large bar sizes are displayed in human-readable format (with units).
+	  Thanks to Matthew Wilcox.
+
+	* Physical slot information is displayed correctly for multi-function cards.
+	  Fixed by Matthew Wilcox.
+
+	* Fixed a couple of typos everywhere.
+
+	* Library: Fixed bugs in freeing of capabilities.
+
+	* Windows back-end compiles again.
+
 2009-08-14  Martin Mares <mj@ucw.cz>
 
 	* Released as 3.1.4.
diff -ruN pciutils-3.1.4/Makefile pciutils-3.1.5/Makefile
--- pciutils-3.1.4/Makefile	2009-08-14 14:33:49.000000000 +0200
+++ pciutils-3.1.5/Makefile	2010-01-19 10:36:35.000000000 +0100
@@ -1,11 +1,11 @@
 # Makefile for The PCI Utilities
-# (c) 1998--2009 Martin Mares <mj@ucw.cz>
+# (c) 1998--2010 Martin Mares <mj@ucw.cz>
 
 OPT=-O2
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
 
-VERSION=3.1.4
-DATE=2009-08-14
+VERSION=3.1.5
+DATE=2010-01-19
 
 # Host OS and release (override if you are cross-compiling)
 HOST=
diff -ruN pciutils-3.1.4/README pciutils-3.1.5/README
--- pciutils-3.1.4/README	2009-08-14 14:40:38.000000000 +0200
+++ pciutils-3.1.5/README	2010-01-19 10:39:55.000000000 +0100
@@ -1,6 +1,6 @@
-This package contains the PCI Utilities, version 3.1.4.
+This package contains the PCI Utilities, version 3.1.5.
 
-Copyright (c) 1997--2009 Martin Mares <mj@ucw.cz>
+Copyright (c) 1997--2010 Martin Mares <mj@ucw.cz>
 
 All files in this package can be freely distributed and used according
 to the terms of the GNU General Public License, either version 2 or
diff -ruN pciutils-3.1.4/lib/caps.c pciutils-3.1.5/lib/caps.c
--- pciutils-3.1.4/lib/caps.c	2009-08-10 16:28:53.000000000 +0200
+++ pciutils-3.1.5/lib/caps.c	2010-01-16 12:08:55.000000000 +0100
@@ -71,7 +71,7 @@
       if (been_there[where]++)
 	break;
       pci_add_cap(d, where, id, PCI_CAP_EXTENDED);
-      where = header >> 20;
+      where = (header >> 20) & ~3;
     }
   while (where);
 }
@@ -96,8 +96,8 @@
 
   while (cap = d->first_cap)
     {
-      d->first_cap = cap;
-      pci_mfree(d);
+      d->first_cap = cap->next;
+      pci_mfree(cap);
     }
 }
 
diff -ruN pciutils-3.1.4/lib/names-cache.c pciutils-3.1.5/lib/names-cache.c
--- pciutils-3.1.4/lib/names-cache.c	2008-07-28 17:54:53.000000000 +0200
+++ pciutils-3.1.5/lib/names-cache.c	2009-09-16 10:11:42.000000000 +0200
@@ -1,11 +1,16 @@
 /*
  *	The PCI Library -- ID to Name Cache
  *
- *	Copyright (c) 2008 Martin Mares <mj@ucw.cz>
+ *	Copyright (c) 2008--2009 Martin Mares <mj@ucw.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
+#include "internal.h"
+#include "names.h"
+
+#ifdef PCI_USE_DNS
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,11 +19,6 @@
 #include <pwd.h>
 #include <unistd.h>
 
-#include "internal.h"
-#include "names.h"
-
-#ifdef PCI_USE_DNS
-
 static const char cache_version[] = "#PCI-CACHE-1.0";
 
 static char *get_cache_name(struct pci_access *a)
diff -ruN pciutils-3.1.4/lib/sysfs.c pciutils-3.1.5/lib/sysfs.c
--- pciutils-3.1.4/lib/sysfs.c	2009-08-10 16:28:54.000000000 +0200
+++ pciutils-3.1.5/lib/sysfs.c	2009-08-21 11:55:36.000000000 +0200
@@ -238,7 +238,6 @@
 	      {
 		d->phy_slot = pci_malloc(a, strlen(entry->d_name) + 1);
 		strcpy(d->phy_slot, entry->d_name);
-		break;
 	      }
 	}
       fclose(file);
diff -ruN pciutils-3.1.4/ls-caps.c pciutils-3.1.5/ls-caps.c
--- pciutils-3.1.4/ls-caps.c	2009-08-10 16:28:54.000000000 +0200
+++ pciutils-3.1.5/ls-caps.c	2009-08-21 11:55:17.000000000 +0200
@@ -798,7 +798,7 @@
   u16 w;
 
   t = get_conf_long(d, where + PCI_EXP_SLTCAP);
-  printf("\t\tSltCap:\tAttnBtn%c PwrCtrl%c MRL%c AttnInd%c PwrInd%c HotPlug%c Surpise%c\n",
+  printf("\t\tSltCap:\tAttnBtn%c PwrCtrl%c MRL%c AttnInd%c PwrInd%c HotPlug%c Surprise%c\n",
 	FLAG(t, PCI_EXP_SLTCAP_ATNB),
 	FLAG(t, PCI_EXP_SLTCAP_PWRC),
 	FLAG(t, PCI_EXP_SLTCAP_MRL),
diff -ruN pciutils-3.1.4/ls-ecaps.c pciutils-3.1.5/ls-ecaps.c
--- pciutils-3.1.4/ls-ecaps.c	2009-08-10 16:28:54.000000000 +0200
+++ pciutils-3.1.5/ls-ecaps.c	2010-01-16 12:09:55.000000000 +0100
@@ -284,6 +284,6 @@
 	    printf("#%02x\n", id);
 	    break;
 	}
-      where = header >> 20;
+      where = (header >> 20) & ~3;
     } while (where);
 }
diff -ruN pciutils-3.1.4/lspci.c pciutils-3.1.5/lspci.c
--- pciutils-3.1.4/lspci.c	2009-08-10 16:28:54.000000000 +0200
+++ pciutils-3.1.5/lspci.c	2009-11-22 18:18:05.000000000 +0100
@@ -330,18 +330,16 @@
 static void
 show_size(pciaddr_t x)
 {
+  static const char suffix[][2] = { "", "K", "M", "G", "T" };
+  unsigned i;
   if (!x)
     return;
-  printf(" [size=");
-  if (x < 1024)
-    printf("%d", (int) x);
-  else if (x < 1048576)
-    printf("%dK", (int)(x / 1024));
-  else if (x < 0x80000000)
-    printf("%dM", (int)(x / 1048576));
-  else
-    printf(PCIADDR_T_FMT, x);
-  putchar(']');
+  for (i = 0; i < (sizeof(suffix) / sizeof(*suffix) - 1); i++) {
+    if (x < 1024)
+      break;
+    x /= 1024;
+  }
+  printf(" [size=%u%s]", (unsigned)x, suffix[i]);
 }
 
 static void
diff -ruN pciutils-3.1.4/pci.ids pciutils-3.1.5/pci.ids
--- pciutils-3.1.4/pci.ids	2009-08-14 14:32:27.000000000 +0200
+++ pciutils-3.1.5/pci.ids	2010-01-19 10:18:08.000000000 +0100
@@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2009.08.14
-#	Date:    2009-08-14 14:32:03
+#	Version: 2010.01.19
+#	Date:    2010-01-19 10:18:08
 #
 #	Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
 #	PCI ID Project at http://pciids.sf.net/.
@@ -22,7 +22,7 @@
 #		subvendor subdevice  subsystem_name	<-- two tabs
 
 0000  Gammagraphx, Inc. (or missing ID)
-0010  Allied Telesyn International
+0010  Allied Telesis, Inc
 # This is a relabelled RTL-8139
 	8139  AT-2500TX V3 Ethernet
 001a  Ascend Communications, Inc.
@@ -364,6 +364,7 @@
 	0057  M1064E MegaRAID SAS
 		8086 346c  Embedded Software RAID Technology II (ESTRII)
 	0058  SAS1068E PCI-Express Fusion-MPT SAS
+		1000 3140  SAS3081E-R 8-Port SAS/SATA Host Bus Adapter
 		1028 021d  SAS 6/iR Integrated Workstations RAID Controller
 		1028 1f0e  SAS 6/iR Adapter RAID Controller
 		1028 1f0f  SAS 6/iR Integrated Blades RAID Controller
@@ -409,6 +410,10 @@
 	0065  SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor]
 	0070  SAS2004 PCI-Express Fusion-MPT SAS-2 [Spitfire]
 	0072  SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon]
+		1028 1f1c  6Gbps SAS HBA Adapter
+		1028 1f1d  PERC H200 Adapter
+		1028 1f1e  PERC H200 Integrated
+		1028 1f1f  PERC H200 Modular
 	0073  MegaRAID SAS 9240
 		1000 9240  MegaRAID SAS 9240-4i
 	0074  SAS2108 PCI-Express Fusion-MPT SAS-2 [Liberator]
@@ -426,6 +431,14 @@
 		1028 1f1b  PERC H700 Integrated
 	007c  MegaRAID SAS 1078DE
 		1014 0395  ServeRAID-AR10is SAS/SATA Controller
+	0080  SAS2208 PCI-Express Fusion-MPT SAS-2
+	0081  SAS2208 PCI-Express Fusion-MPT SAS-2
+	0082  SAS2208 PCI-Express Fusion-MPT SAS-2
+	0083  SAS2208 PCI-Express Fusion-MPT SAS-2
+	0084  SAS2208 PCI-Express Fusion-MPT SAS-2
+	0085  SAS2208 PCI-Express Fusion-MPT SAS-2
+	0086  SAS2208 PCI-Express Fusion-MPT SAS-2
+	0087  SAS2208 PCI-Express Fusion-MPT SAS-2
 	008f  53c875J
 		1092 8000  FirePort 40 SCSI Controller
 		1092 8760  FirePort 40 Dual SCSI Host Adapter
@@ -676,10 +689,12 @@
 	4382  SB600 AC97 Audio
 	4383  SBx00 Azalia (Intel HDA)
 		103c 280a  DC5750 Microtower
+		1043 836c  M4A785TD Motherboard
 		17f2 5000  KI690-AM2 Motherboard
 	4384  SBx00 PCI to PCI Bridge
 	4385  SBx00 SMBus Controller
 		103c 280a  DC5750 Microtower
+		1043 8389  M4A785TD Motherboard
 		1462 7368  K9AG Neo2
 		17f2 5000  KI690-AM2 Motherboard
 	4386  SB600 USB Controller (EHCI)
@@ -717,6 +732,7 @@
 		17f2 5000  KI690-AM2 Motherboard
 	438e  SB600 AC97 Modem
 	4390  SB700/SB800 SATA Controller [IDE mode]
+		1043 8389  M4A785TD Motherboard
 		1849 4390  Motherboard (one of many)
 	4391  SB700/SB800 SATA Controller [AHCI mode]
 	4392  SB700/SB800 SATA Controller [Non-RAID5 mode]
@@ -750,6 +766,7 @@
 		8086 464a  Rage Pro Turbo AGP 2X
 	4744  3D Rage Pro AGP 1X
 		1002 4744  Rage Pro Turbo AGP
+		8086 4d55  Rage 3D Pro AGP 1X [Intel MU440EX]
 	4747  3D Rage Pro
 	4749  3D Rage Pro
 		1002 0061  Rage Pro AIW
@@ -1018,6 +1035,7 @@
 		148c 2026  R200 QL [Radeon 8500 Evil Master II Multi Display Edition]
 		1681 0010  Radeon 8500 [3D Prophet 8500 128Mb]
 		174b 7149  Radeon R200 QL [Sapphire Radeon 8500 LE]
+		1787 0f08  Radeon R200 QL [PowerMagic Radeon 8500]
 	514d  Radeon R200 QM [Radeon 9100]
 	514e  Radeon R200 QN [Radeon 8500LE]
 	514f  Radeon R200 QO [Radeon 8500LE]
@@ -1344,6 +1362,8 @@
 	5e6d  RV410 [Radeon X700 (PCIE)] (Secondary)
 		148c 2117  PowerColor Bravo X700
 	5f57  R423 [Radeon X800XT (PCIE)]
+	6899  Cypress [Radeon HD 5800 Series]
+	68b8  Juniper [Radeon HD 5700 Series]
 	700f  PCI Bridge [IGP 320M]
 	7010  PCI Bridge [IGP 340M]
 	7100  R520 [Radeon X1800]
@@ -1510,18 +1530,24 @@
 	9443  R700 [Radeon HD 4850]
 	944a  M98L [Mobility Radeon HD 4850]
 	944c  RV770 LE [Radeon HD 4800 Series]
+	944e  RV770 CE [Radeon HD 4710]
 	9450  RV770 [FireStream 9270]
 	9452  RV770 [FireStream 9250]
 	945a  M98 XT [Mobility Radeon HD 4870]
 	9460  RV790 [Radeon HD 4800 Series]
+	9462  RV790LE [Radeon HD 4800 Series]
 	9480  M96 [Mobility Radeon HD 4650]
+		103c 3628  ATI Mobility Radeon HD 4650 [dv6-1190en]
+	9485  RV740 Pro [Radeon HD 4770]
 	9489  M96 XT [Mobility FireGL V5725]
 	9490  RV730XT [Radeon HD 4670]
 		174b e880  Radeon HD 4670 512MB DDR3
 	9491  M96 CSP [ATI RADEON E4690]
-	9495  HD 4650
+	9495  RV730 Pro AGP [Radeon HD 4600 Series]
 		1002 9495  RV730 XT [PowerColor Radeon HD4670 AGP 1GB DDR]
+		1458 0028  HD4650
 	9498  RV730 PRO [Radeon HD 4650]
+	949e  RV370 [FirePro V5700]
 	949f  RV730 [FirePro V5700]
 	94a0  Mobility Radeon HD 4830 [M97]
 	94a1  [M97 XT] Mobility Radeon HD 4860
@@ -1542,6 +1568,7 @@
 	94cb  Radeon E2400
 	94cc  RV 610LE PCI [Radeon HD 2400]
 	9501  Radeon HD 3870
+		174b e620  Sapphire Radeon HD 3870 PCIe 2.0
 	9504  Mobility Radeon HD 3850
 	9505  RV670PRO [Radeon HD 3850]
 	9507  RV670 [Radeon HD 3850]
@@ -1577,9 +1604,9 @@
 		1002 95c0  Mobility Radeon HD 3470
 	95c4  Mobility Radeon HD 3400 Series
 		1002 95c4  Mobility Radeon HD 3400
-	95c5  Mobility Radeon HD 3450
-		1002 95c5  Mobility Radeon HD 3450
+	95c5  RV620 LE [Radeon HD 3450]
 	95c6  RV620 LE AGP [Radeon HD 3450]
+	95c7  RV620 CE [Radeon HD 3430]
 	95c9  RV620 PCI [Radeon HD 3450]
 	95cc  RV620 [ATI FireGL V3700]
 	95cd  RV620 [FireMV 2450]
@@ -1587,12 +1614,20 @@
 	95cf  RV620 [FirePro 2260]
 	960f  RS780 Azalia controller
 	9610  Radeon HD 3200 Graphics
+		1458 d000  GA-MA78GM-S2H Motherboard
 	9611  Radeon 3100 Graphics
 	9612  RS780M/RS780MN [Radeon HD 3200 Graphics]
 	9613  RS780MC [Radeon HD 3100 Graphics]
 	9614  Radeon HD 3300 Graphics
 	9615  RS780E [AMD 780E]
 	9616  760G [Radeon 3000]
+	970f  RS880 Audio Device [Radeon HD 4200]
+		1043 83a2  M4A785TD Motherboard
+	9710  RS880 [Radeon HD 4200]
+		1043 83a2  M4A785TD Motherboard
+	9712  M880G [Mobility Radeon HD 4200]
+	9713  M860G [Mobility Radeon 4100]
+	9723  Radeon HD 5450
 	aa00  R600 Audio Device [Radeon HD 2900 Series]
 	aa08  RV630/M76 audio device [Radeon HD 2600 Series]
 	aa10  RV610 audio device [Radeon HD 2400 PRO]
@@ -1603,8 +1638,11 @@
 	aa28  RV620 Audio device [Radeon HD 34xx Series]
 	aa30  HD48x0 audio
 		174b aa30  Sapphire HD 4850 512MB GDDR3 PCI-E Dual Slot Fansink
-	aa38  R700 Audio Device [Radeon HD 4000 Series]
+	aa38  RV710/730
+		103c 3628  ATI RV710/730 [dv6-1190en]
 		174b aa38  R700 Audio Device [Radeon HD 4000 Series]
+	aa50  Cypress HDMI Audio [Radeon HD 5800 Series]
+	aa58  Juniper HDMI Audio [Radeon HD 5700 Series]
 	ac00  Theater 600 Pro
 	cab0  AGP Bridge [IGP 320M]
 	cab2  RS200/RS200M AGP Bridge [IGP 340M]
@@ -1992,6 +2030,16 @@
 		1014 030a  PCIe 3Gb SAS RAID Adapter (574E)
 		1014 033a  PCIe 3Gb SAS Adapter (57B3)
 		1014 0360  PCI-E Auxiliary Cache Adapter (57B7)
+	033d  PCI-E IPR SAS Adapter (FPGA)
+		1014 033c  PCIe2 1.8GB Cache 6Gb SAS RAID Adapter Tri-port (57B5)
+		1014 0356  PCIe2 1.8GB Cache 6Gb SAS RAID & SSD Adapter (574D)
+		1014 035f  PCIe2 6Gb SAS Adapter Quad-port (57B2)
+	034a  PCI-E IPR SAS Adapter (ASIC)
+		1014 033b  PCIe2 6Gb SAS RAID Adapter Quad-port (57B4)
+		1014 0355  PCIe2 3.6GB Cache 6Gb SAS RAID Adapter Quad-port (57B1)
+		1014 0357  PCIe2 6Gb SAS Adapter Quad-port (57C6)
+		1014 035d  PCIe2 3.6GB Cache 6Gb SAS RAID & SSD Adapter (575D)
+		1014 035e  PCIe2 3.6GB Cache 6Gb SAS RAID Adapter Quad-port (57CE)
 	3022  QLA3022 Network Adapter
 	4022  QLA3022 Network Adapter
 	ffff  MPIC-2 interrupt controller
@@ -2159,7 +2207,8 @@
 		161f 3017  HDAMB
 	7461  AMD-8111 USB
 	7462  AMD-8111 Ethernet
-	7464  AMD-8111 USB
+	7463  AMD-8111 USB EHCI
+	7464  AMD-8111 USB OHCI
 		161f 3017  HDAMB
 	7468  AMD-8111 LPC
 		161f 3017  HDAMB
@@ -2463,14 +2512,45 @@
 		1705 0002  Millennium G450 16MB SGRAM
 		1705 0003  Millennium G450 32MB
 		1705 0004  Millennium G450 16MB
-	0527  MGA Parhelia AGP
+	0527  Parhelia
 		102b 0840  Parhelia 128Mb
-		102b 0850  Parhelia 256MB AGP 4X
-	0528  Parhelia 8X
+		102b 0850  Parhelia 256MB
+		102b 0870  MED2mp-DVI
+		102b 0880  P-256 Edge Overlap Controller
+	0528  Parhelia
 		102b 1020  Parhelia 128MB
 		102b 1030  Parhelia 256 MB Dual DVI
+		102b 1040  MED2mp-DVI
+		102b 1050  Sono S20
+		102b 1060  PJ-30L
+		102b 1070  PJ-40L
+		102b 1421  MED5mp
+		102b 1431  MED3mp-DVI
+		102b 1451  MED5mp-DVI
+		102b 1491  MED2mp-DVI
+		102b 14b1  MED3mp-DVI
+		102b 14c1  MED5mp-DVI
 		102b 14e1  Parhelia PCI 256MB
+		102b 14f1  Parhelia Precision SGT
+		102b 1501  ATC-4MP
+		102b 1511  ATC-4MP
+		102b 1521  TheatreVUE T30
+		102b 1531  TheatreVUE T20
+		102b 1541  MED2mp-DVI
+		102b 1551  MED3mp-DVI
+		102b 1561  MED5mp-DVI
+		102b 1571  Parhelia DL256 PCI
+		102b 1591  Parhelia Precision SDT
+		102b 15a1  MED4mp-DVI
+		102b 2011  Parhelia HR256
 		102b 2021  QID Pro
+		102b 2061  PJ-40LP
+		102b 2081  EWS Quad
+		102b 2411  PPX-OUT8
+		102b 2421  VPX-OUT8
+		102b 2441  PPX-OUT4
+		102b 2451  VPX-OUT4
+		102b 2491  LPX-OUT4
 	0530  MGA G200EV
 	0532  MGA G200eW WPCM450
 		1028 0235  PowerEdge R710 MGA G200eW WPCM450
@@ -2482,12 +2562,17 @@
 		1028 029c  PowerEdge M710 MGA G200eW WPCM450
 	0540  M91XX
 		102b 2080  M9140 LP PCIe x16
+		102b 20c0  Xenia
+		102b 20c1  Xenia Pro
 		102b 2100  M9120 PCIe x16
 		102b 2140  M9125 PCIe x16
 		102b 2180  M9120 Plus LP PCIe x16
 		102b 21c0  M9120 Plus LP PCIe x1
+		102b 2200  VDA1164 Output Board
 		102b 2240  M9148 LP PCIe x16
 		102b 2241  M9138 LP PCIe x16
+		102b 2280  M9188 ATX PCIe x16
+		102b 22c0  M9128 LP PCIe x16
 	0d10  MGA Ultima/Impression
 	1000  MGA G100 [Productiva]
 		102b ff01  Productiva G100
@@ -2510,18 +2595,51 @@
 	2537  Millenium P650/P750
 		102b 1820  Millennium P750 64MB
 		102b 1830  Millennium P650 64MB
+		102b 1850  RAD2mp
+		102b 1860  RAD3mp
+		102b 1880  Sono S10
 		102b 1c10  QID 128MB
 		102b 2811  Millennium P650 Low-profile PCI 64MB
+		102b 2821  Millenium P650 Low-profile PCI
+		102b 2841  RAD PCI
+		102b 2851  Spectrum PCI
+		102b 2871  EpicA TC2
 		102b 2c11  QID Low-profile PCI
+		102b 2c21  QID LP PCI LW
+		102b 2c31  QID LP PCI
+		102b 2c41  EpicA TC4
+		102b 3001  Extio F1400
+		102b 3011  Extio F1220
+		102b 3041  RG-200DL
+		102b 3051  RG-400SL
+		102b 3061  Extio F1420
+		102b 3081  Extio F1240
 	2538  Millenium P650 PCIe
+		102b 0847  RAD PCIe
 		102b 08c7  Millennium P650 PCIe 128MB
 		102b 0907  Millennium P650 PCIe 64MB
 		102b 0947  Parhelia APVe
+		102b 0987  ATC PCIe 4MP
 		102b 1047  Millennium P650 LP PCIe 128MB
 		102b 1087  Millennium P650 LP PCIe 64MB
+		102b 1801  Millenium P650 PCIe x1
 		102b 2538  Parhelia APVe
 		102b 3007  QID Low-profile PCIe
+		102b 3087  Aurora VX3mp
+		102b 30c7  QID LP PCIe
 	2539  Millennium P690
+		102b 0040  Millenium P690 PCIe x16
+		102b 0042  ONYX
+		102b 0043  SPECTRA
+		102b 0080  Millenium P690 Plus LP PCIe x16
+		102b 0081  Millenium P690 LP PCIe x16
+		102b 0082  RAD LPX PCIe x16
+		102b 00c0  Millenium P690 Plus LP PCI
+		102b 00c2  Millenium P690 LP PCI
+		102b 00c3  RAD LPX PCI
+		102b 0101  Millenium P690 PCI
+		102b 0140  Millenium P690 LP PCIe x1
+		102b 0180  Display Wall IP Decode 128 MB
 	4536  VIA Framegrabber
 	4cdc  Morphis Vision System Jpeg2000
 	4fc5  Morphis Vision System
@@ -2963,8 +3081,12 @@
 # Found on ASUS M2V motherboard
 	81e7  Realtek ALC-660 6-channel CODEC
 	81f4  EN7300TC512/TD/128M/A(C262G) [Graphics Card EN7300TC512]
+	8233  EEE-PC 701 Netbook
 	82ca  G96 GeForce 9500 GT
 	82e8  M3N72-D
+# wrong vendor ID (should have been AMD)
+	9602  RS880 PCI to PCI bridge (int gfx)
+		1043 83a2  M4A785TD Motherboard
 1044  Adaptec (formerly DPT)
 	1012  Domino RAID Engine
 	a400  SmartCache/Raid I-IV Controller
@@ -3538,6 +3660,7 @@
 		105a b600  SuperTrak EX16650
 		105a b601  SuperTrak EX16654
 		105a b602  SuperTrak EX16658
+	8760  PM8010 [SuperTrak EX SAS and SATA 6G RAID Controller]
 	c350  80333 [SuperTrak EX12350]
 	e350  80333 [SuperTrak EX24350]
 105b  Foxconn International, Inc.
@@ -3611,6 +3734,7 @@
 1062  Maspar Computer Corp
 1063  Ocean Office Automation
 1064  Alcatel
+	1102  Dynamite 2840 (ADSL PCI modem)
 1065  Texas Microsystems
 1066  PicoPower Technology
 	0000  PT80C826
@@ -3748,6 +3872,7 @@
 	000a  DS1L Audio
 		1073 0004  DS-XG PCI Audio CODEC
 		1073 000a  DS-XG PCI Audio CODEC
+		8086 4d55  DS-XG PCI Audio CODEC [Intel MU440EX]
 	000c  YMF-740C [DS-1L Audio Controller]
 		107a 000c  DS-XG PCI Audio CODEC
 	000d  YMF-724F [DS-1 Audio Controller]
@@ -3799,8 +3924,17 @@
 	6312  SP202-based 2Gb Fibre Channel to PCI-X HBA
 	6322  SP212-based 2Gb Fibre Channel to PCI-X HBA
 	7220  IBA7220 InfiniBand HCA
+	7322  IBA7322 QDR InfiniBand HCA
 	8000  10GbE Converged Network Adapter (TCP/IP Networking)
 	8001  10GbE Converged Network Adapter (FCoE)
+	8020  cLOM8214 1/10GbE Controller
+		1077 0203  8200 Series Single Port 10GbE Converged Network Adapter (TCP/IP Networking)
+		1077 0207  8200 Series Dual Port 10GbE Converged Network Adapter (TCP/IP Networking)
+		1077 020b  3200 Series Dual Port 10Gb Intelligent Ethernet Adapter
+		1077 020c  3200 Series Quad Port 1Gb Intelligent Ethernet Adapter
+		1077 020f  3200 Series Single Port 10Gb Intelligent Ethernet Adapter
+	8021  8200 Series 10GbE Converged Network Adapter (FCoE)
+	8022  8200 Series 10GbE Converged Network Adapter (iSCSI)
 	8432  ISP2432M-based 10GbE Converged Network Adapter (CNA)
 1078  Cyrix Corporation
 	0000  5510 [Grappa]
@@ -3824,6 +3958,7 @@
 	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]
 107e  Interphase Corporation
 	0001  5515 ATM Adapter [Flipper]
@@ -4316,6 +4451,7 @@
 	8547  PEX 8547 48-lane, 3-port PCI Express Switch
 	8548  PEX 8548 48-lane, 9-port PCI Express Switch
 	8647  PEX 8647 48-Lane, 3-Port PCI Express Gen 2 (5.0 GT/s) Switch
+	9016  PLX 9016 8-port serial controller
 	9030  PCI9030 32-bit 33MHz PCI <-> IOBus Bridge
 		10b5 2695  Hilscher CIF50-PB Profibus Master Board
 		10b5 2862  Alpermann+Velte PCL PCI LV (3V/5V): Timecode Reader Board
@@ -4407,6 +4543,7 @@
 		16df 0016  PIKA InLine MM
 	9056  PCI9056 32-bit 66MHz PCI <-> IOBus Bridge
 		10b5 2979  CellinkBlade 11 - CPCI board VoATM AAL1
+		10b5 3268  IXXAT iPC-I XC16/PCIe CAN Board
 		10b5 3352  Alpermann+Velte PCL PCIe HD: Timecode Reader Board
 		10b5 3353  Alpermann+Velte PCL PCIe D: Timecode Reader Board
 		10b5 3354  Alpermann+Velte PCL PCIe LV: Timecode Reader Board
@@ -5169,6 +5306,7 @@
 		105b 0c43  Winfast NF3250K8AA
 		1462 7030  K8N Neo-FSR v2.0
 		147b 1c0b  NF8 Mainboard
+		1849 00e5  Motherboard (one of many)
 		f849 00e5  Motherboard (one of many)
 	00e6  CK8S Ethernet Controller
 	00e7  CK8S USB Controller
@@ -5768,6 +5906,7 @@
 	03d1  C61 [GeForce 6100 nForce 405]
 	03d2  C61 [GeForce 6100 nForce 400]
 	03d5  C61 [GeForce 6100 nForce 420]
+	03d6  C61 [GeForce 7025 / nForce 630a]
 	03e0  MCP61 LPC Bridge
 		1849 03e0  939NF6G-VSTA Board
 	03e1  MCP61 LPC Bridge
@@ -5818,6 +5957,7 @@
 	040a  G84 [Quadro FX 370]
 	040b  Quadro NVS 320M
 	040c  Quadro FX 570M
+		17aa 20d9  ThinkPad T61p
 	040d  Quadro FX 1600M
 	040e  G84 [Quadro FX 570]
 	040f  G84 [Quadro FX 1700]
@@ -5941,6 +6081,7 @@
 	05f9  GT200GL [Quadro CX]
 	05fd  GT200GL [Quadro FX 5800]
 	05fe  GT200GL [Quadro FX 4800]
+	05ff  GT200GL [NVIDIA Quadro FX 3800]
 	0600  G92 [GeForce 8800 GTS 512]
 	0601  G92 [GeForce 9800 GT]
 	0602  G92 [GeForce 8800 GT]
@@ -5975,6 +6116,8 @@
 	061a  G92 [Quadro FX 3700]
 	061b  G92GL [Quadro VX 200]
 	061c  G92M [Quadro FX 3600M]
+	061d  G92 [Quadro FX 2800M]
+	061f  G92 [Quadro FX 3800M]
 	0622  G94 [GeForce 9600 GT]
 		107d 2ac1  WinFast PX9600GT 1024MB
 		1458 3481  GV-NX96T512HP
@@ -6179,7 +6322,15 @@
 	0873  C79 [GeForce G102M]
 	087a  C79 [Quadro FX 470]
 	087d  ION VGA
+	087e  ION LE VGA
 	087f  C79 [Quadro FX 470M]
+	0a20  GT200 [GeForce GT 220]
+	0a28  GeForce GT 230M
+	0a60  GT200 [GeForce G210]
+	0a64  GT218 [ION]
+	0a65  GT200 [GeForce 210]
+# formerly known as NVIDIA Quadro NVS 170M
+	0a6c  NVIDIA NVS 3100M
 	0a80  MCP79 Host Bridge
 	0a81  MCP79 Host Bridge
 	0a82  MCP79 Host Bridge
@@ -6237,6 +6388,9 @@
 		1043 82e8  M3N72-D
 		1849 0ad4  K10N78FullHD-hSLI R3.0 AHCI Controller
 	0ad8  MCP78S [GeForce 8200] SATA Controller (RAID mode)
+	0be2  High Definition Audio Controller
+	0be3  High Definition Audio Controller
+	0be4  High Definition Audio Controller
 10df  Emulex Corporation
 	1ae5  LP6000 Fibre Channel Host Adapter
 	e100  Proteus-X: LightPulse IOV Fibre Channel Host Adapter
@@ -6257,6 +6411,7 @@
 	f100  Saturn-X: LightPulse Fibre Channel Host Adapter
 	f111  Saturn-X LightPulse Fibre Channel Host Adapter
 	f112  Saturn-X LightPulse Fibre Channel Host Adapter
+	f180  LPSe12002 EmulexSecure Fibre Channel Adapter
 	f700  LP7000 Fibre Channel Host Adapter
 	f701  LP7000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)
 	f800  LP8000 Fibre Channel Host Adapter
@@ -6362,6 +6517,7 @@
 	0260  Realtek 260 High Definition Audio
 	0261  Realtek 261 High Definition Audio
 	0262  Realtek 262 High Definition Audio
+	0269  Realtek ALC269 High Definition Audio (82801G)
 	0280  Realtek 280 High Definition Audio
 	0660  Realtek 660 High Definition Audio
 	0662  Realtek 662 High Definition Audio
@@ -6441,6 +6597,7 @@
 		1043 11f5  A6J-Q008
 		1043 16d5  U6V laptop
 		1043 81aa  P5B
+		1043 83a3  M4A785TD Motherboard
 		1458 e000  GA-EP45-DS5 Motherboard
 		1462 238c  Onboard RTL8111b on MSI P965 Platinum Mainboard
 		1462 368c  K9AG Neo2
@@ -6454,6 +6611,7 @@
 		1385 311a  GA311
 		1458 e000  GA-8I915ME-G Mainboard
 		1462 030c  K8N Neo-FSR v2.0 mainboard
+		1462 065c  Hetis 865GV-E (MS-7065)
 		1462 702c  K8T NEO 2 motherboard
 		1462 7094  K8T Neo2-F V2.0
 		16ec 011f  USR997903
@@ -6574,6 +6732,7 @@
 		1102 4004  EMU1010 Digital Audio System [MAEM8960]
 	0009  [SB X-Fi Xtreme Audio] CA0110-IBG
 		1102 0010  [SB X-Fi Xtreme Audio] CA0110-IBG
+		1102 0018  SB1040
 	000b  X-Fi Titanium series [EMU20k2]
 		1102 0041  SB X-Fi Titanium PCI-e [SB0880]
 	4001  SB Audigy FireWire Port
@@ -6587,6 +6746,7 @@
 	7005  SB Audigy LS Game Port
 		1102 1001  SB0310 Audigy LS MIDI/Game port
 		1102 1002  SB0312 Audigy LS MIDI/Game port
+	7006  [SB X-Fi Xtreme Audio] CA0110-IBG PCI to PCIe Bridge
 	8938  Ectiva EV1938
 		1033 80e5  SlimTower-Jim (NEC)
 		1071 7150  Mitac 7150
@@ -6818,6 +6978,7 @@
 		0010 0001  IEEE 1394 4port DCST 1394-3+1B
 		1025 005a  TravelMate 290
 		1043 808a  A8V/A8N/P4P800 series motherboard
+		1043 81fe  M4A series motherboard
 		1458 1000  GA-7VT600-1394 Motherboard
 		1462 207d  K8NGM2 series motherboard
 		1462 217d  Aspire L250
@@ -7038,6 +7199,7 @@
 	4351  VT3351 Host Bridge
 	4353  VX800/VX820 Power Management Control
 	4364  CN896/VN896/P4M900 Host Bridge
+	4397  VT1708B/1702S/1708S HD audio codec
 	4409  VX855/VX875 Power Management Control
 	5030  VT82C596 ACPI [Apollo PRO]
 	5122  VX855/VX875 Chrome 9 HCM Integrated Graphics
@@ -7320,6 +7482,7 @@
 		111a 0a09  ENI-3060 ADSL (VPI=<0..15>)
 	0007  SpeedStream ADSL
 		111a 1001  ENI-3061 ADSL [ASIC]
+	1020  SpeedStream PCI 10/100 Network Card
 	1203  SpeedStream 1023 Wireless PCI Adapter
 111b  Teledyne Electronic Systems
 111c  Tricord Systems Inc.
@@ -7553,7 +7716,8 @@
 		153b 1157  Cinergy 1200 DVB-T
 		1894 0020  KNC One DVB-C V1.0
 		1894 0023  TVStation DVB-C plus
-	7162  Pinnacle PCTV 3010iX Dual Analog + DVB-T (VT8251 Ultra VLINK Controller)
+	7162  SAA7162
+		11bd 0101  Pinnacle PCTV 7010iX TV Card
 	9730  SAA9730 Integrated Multimedia and Peripheral Controller
 		1131 0000  Integrated Multimedia and Peripheral Controller
 1132  Mitel Corp.
@@ -7660,9 +7824,16 @@
 	0023  81 VIC PCIe Upstream Port
 	0040  VIC PCIe Upstream Port
 	0041  VIC PCIe Downstream Port
+	0042  VIC Management Controller
+		1137 0047  P81E PCIe
 	0043  VIC Ethernet NIC
+		1137 0047  P81E PCIe
+		1137 0048  M81KR Mezzanine
+	0044  VIC Ethernet NIC Dynamic
+		1137 0047  P81E PCIe
 		1137 0048  M81KR Mezzanine
 	0045  VIC FCoE HBA
+		1137 0047  P81E PCIe
 		1137 0048  M81KR Mezzanine
 1138  Ziatech Corporation
 	8905  8905 [STD 32 Bridge]
@@ -8273,6 +8444,7 @@
 	010c  CompuScope 82G 8bit 2GS/s Analog Input Card
 1198  Lambda Systems Inc
 1199  Attachmate Corporation
+	6832  Sierra Wireless MC8780 Device
 119a  Mind Share, Inc.
 119b  Omega Micro Inc.
 	1221  82C092G
@@ -8305,8 +8477,13 @@
 	1faa  88w8335 [Libertas] 802.11b/g Wireless
 		1385 4e00  WG511v2 54 Mbps Wireless PC Card
 		1385 6b00  WG311v3 802.11g Wireless PCI Adapter
+	2211  88SB2211 PCI Express to PCI Bridge
 	2a01  88W8335 [Libertas] 802.11b/g Wireless
 	2a02  88W8361 [TopDog] 802.11n Wireless
+	2a0c  88W8363 [TopDog] 802.11n Wireless
+	2a30  88W8687 [TopDog] 802.11b/g Wireless
+	2a40  88W8366 [TopDog] 802.11n Wireless
+	2a43  88W8366 [TopDog] 802.11n Wireless
 	4101  OLPC Cafe Controller Secure Digital Controller
 	4320  88E8001 Gigabit Ethernet Controller
 		1019 0f38  Marvell 88E8001 Gigabit Ethernet Controller (ECS)
@@ -8457,11 +8634,15 @@
 	6042  88SX6042 PCI-X 4-Port SATA-II
 	6081  MV88SX6081 8-port SATA II PCI-X Controller
 	6101  88SE6101 single-port PATA133 interface
-	6102  88SE6102 single-port PATA133(IDE) interface
 	6111  88SE6111 1-port PATA133(IDE) and 1-port SATA II Controllers
 	6121  88SE6121 SATA II Controller
 	6141  88SE614x SATA II PCI-E controller
 	6145  88SE6145 SATA II PCI-E controller
+	6180  88F6180 [Kirkwood] ARM SoC
+	6192  88F6190/6192 [Kirkwood] ARM SoC
+	6281  88F6281 [Kirkwood] ARM SoC
+# This device ID was used for earlier chips.
+	6381  MV78xx0 [Discovery Innovation] ARM SoC
 	6450  64560 System Controller
 	6460  MV64360/64361/64362 System Controller
 	6480  MV64460/64461/64462 System Controller
@@ -8469,6 +8650,8 @@
 	6485  MV64460/64461/64462 System Controller, Revision B
 	7042  88SX7042 PCI-e 4-port SATA-II
 		16b8 434b  Tempo SATA E4P
+	7810  MV78100 [Discovery Innovation] ARM SoC
+	7820  MV78200 [Discovery Innovation] ARM SoC
 	f003  GT-64010 Primary Image Piranha Image Generator
 11ac  Canon Information Systems Research Aust.
 11ad  Lite-On Communications Inc
@@ -8772,6 +8955,7 @@
 	9881  RL100TX Fast Ethernet
 11f7  Scientific Atlanta
 11f8  PMC-Sierra Inc.
+	5220  BR522x [PMC-Sierra maxRAID SAS Controller]
 	7364  PM7364 [FREEDM - 32 Frame Engine & Datalink Mgr]
 	7375  PM7375 [LASAR-155 ATM SAR]
 	7384  PM7384 [FREEDM - 84P672 Frm Engine & Datalink Mgr]
@@ -10289,6 +10473,7 @@
 	1003  9550SX SATA-II RAID PCI-X
 	1004  9650SE SATA-II RAID PCIe
 	1005  9690SA SAS/SATA-II RAID PCIe
+	1010  9750 SAS2/SATA-II RAID PCIe
 13c2  Technotrend Systemtechnik GmbH
 	000e  Technotrend/Hauppauge DVB card rev2.3
 	1019  TTechnoTrend-budget DVB S2-3200
@@ -10403,8 +10588,12 @@
 		1043 8275  Virtuoso 100 (Xonar DX)
 		1043 82b7  Virtuoso 200 (Xonar D2X)
 		1043 8314  Virtuoso 200 (Xonar HDAV1.3)
+		1043 8327  Virtuoso 100 (Xonar DX)
 		1043 834f  Virtuoso 100 (Xonar D1)
 		1043 835c  Virtuoso 100 (Xonar Essence STX)
+		1043 835d  Virtuoso 100 (Xonar ST)
+		1043 835e  Virtuoso 200 (Xonar HDAV1.3 Slim)
+		1043 838e  Virtuoso 200 (Xonar DS)
 		14c3 1710  HIFIER
 		1a58 0910  Barracuda AC-1
 		415a 5431  X-Meridian 7.1
@@ -10675,6 +10864,10 @@
 	0031  T320 10GbE Dual Port Adapter
 	0032  T302 1GbE Dual Port Adapter
 	0033  T304 1GbE Quad Port Adapter
+	0034  B320 10GbE Dual Port Adapter
+	0035  S310-CR 10GbE Single Port Adapter
+	0036  S320-LP-CR 10GbE Dual Port Adapter
+	0037  N320-G2-CR 10GbE Dual Port Adapter
 1426  Storage Technology Corp.
 1427  Better On-Line Solutions
 1428  Edec Co Ltd
@@ -10780,6 +10973,7 @@
 	7242  K9AGM RS485 Motherboard
 	7250  MS-7250 Motherboard [K9N Platinum SLI/non-SLI]
 	7327  K9AGM2-FIH Motherboard
+	7650  Hetis 865GV-E (MS-7065)
 	8725  NVIDIA NV25 [GeForce4 Ti 4600] VGA Adapter
 	9000  NVIDIA NV28 [GeForce4 Ti 4800] VGA Adapter
 	9110  GeFORCE FX5200
@@ -11016,6 +11210,7 @@
 		103c 3015  PCIe LAN on Motherboard
 		107b 5048  E4500 Onboard
 	1601  NetXtreme BCM5752M Gigabit Ethernet PCI Express
+	1612  BCM70012 Video Decoder [Crystal HD]
 	1639  NetXtreme II BCM5709 Gigabit Ethernet
 		1028 0235  PowerEdge R710 BCM5709 Gigabit Ethernet
 		1028 0236  PowerEdge R610 BCM5709 Gigabit Ethernet
@@ -11135,6 +11330,8 @@
 		0e11 00e3  NC7761 Gigabit Server Adapter
 		103c 3100  NC1020 ProLiant Gigabit Server Adapter 32 PCI
 		103c 3226  NC150T 4-port Gigabit Combo Switch & Adapter
+	1655  NetXtreme BCM5717 Gigabit Ethernet PCIe
+	1656  NetXtreme BCM5718 Gigabit Ethernet PCIe
 	1658  NetXtreme BCM5720 Gigabit Ethernet
 	1659  NetXtreme BCM5721 Gigabit Ethernet PCI Express
 		1014 02c6  eServer xSeries server mainboard
@@ -11154,6 +11351,7 @@
 		103c 7052  NC105T PCIe Gigabit Server Adapter
 	165b  NetXtreme BCM5723 Gigabit Ethernet PCIe
 		103c 705d  NC107i Integrated PCI Express Gigabit Server Adapter
+	165c  NetXtreme BCM5724 Gigabit Ethernet PCIe
 	165d  NetXtreme BCM5705M Gigabit Ethernet
 		1028 865d  Latitude D400
 		14e4 165d  Dell Latitude D600
@@ -11256,6 +11454,12 @@
 		103c 7038  NC373i PCI Express Multifunction Gigabit Server Adapter
 		103c 703b  NC373i Integrated Multifunction Gigabit Server Adapter
 		103c 703d  NC373F PCI Express Multifunction Gigabit Server Adapter
+	16b0  NetXtreme BCM57761 Gigabit Ethernet PCIe
+	16b1  NetLink BCM57781 Gigabit Ethernet PCIe
+	16b2  NetLink BCM57791 Gigabit Ethernet PCIe
+	16b4  NetXtreme BCM57765 Gigabit Ethernet PCIe
+	16b5  NetLink BCM57785 Gigabit Ethernet PCIe
+	16b6  NetLink BCM57795 Gigabit Ethernet PCIe
 	16c6  NetXtreme BCM5702A3 Gigabit Ethernet
 		10b7 1100  3C1000B-T 10/100/1000 PCI
 		14e4 000c  BCM5702 1000Base-T
@@ -11615,7 +11819,7 @@
 	2464  HSF 56k Data/Fax/Voice Modem (Mob SmartDAA)
 	2465  HSF 56k Data/Fax/Voice/Spkp (w/HS) Modem (Mob SmartDAA)
 	2466  HSF 56k Data/Fax/Voice/Spkp Modem (Mob SmartDAA)
-	2bfa  HDAudio Soft Data Fax Modem with SmartCP
+	2bfa  D110 HDAudio Soft Data Fax Modem with SmartCP
 		1025 0009  Aspire 5622WLMi
 	2f00  HSF 56k HSFi Modem
 		13e0 8d84  IBM HSFi V.90
@@ -11638,6 +11842,7 @@
 	8800  CX23880/1/2/3 PCI Video and Audio Decoder
 		0070 2801  Hauppauge WinTV 28xxx (Roslyn) models
 		0070 3401  Hauppauge WinTV 34xxx models
+		0070 6902  WinTV HVR-4000-HD
 		0070 7801  WinTV HVR-1800 MCE
 		0070 9001  Nova-T DVB-T
 		0070 9200  Nova-SE2 DVB-S
@@ -11687,6 +11892,7 @@
 		7063 5500  pcHDTV HD-5500
 	8802  CX23880/1/2/3 PCI Video and Audio Decoder [MPEG Port]
 		0070 2801  Hauppauge WinTV 28xxx (Roslyn) models
+		0070 6902  WinTV HVR-4000-HD
 		0070 9002  Nova-T DVB-T Model 909
 		0070 9402  WinTV-HVR1100 DVB-T/Hybrid
 		0070 9600  WinTV 88x MPEG Encoder
@@ -11704,11 +11910,13 @@
 		7063 3000  pcHDTV HD3000 HDTV
 		7063 5500  pcHDTV HD-5500
 	8804  CX23880/1/2/3 PCI Video and Audio Decoder [IR Port]
+		0070 6902  WinTV HVR-4000-HD
 		0070 9002  Nova-T DVB-T Model 909
 		0070 9402  WinTV-HVR1100 DVB-T/Hybrid
 		7063 5500  pcHDTV HD-5500
 	8811  CX23880/1/2/3 PCI Video and Audio Decoder [Audio Port]
 		0070 3401  Hauppauge WinTV 34xxx models
+		0070 6902  WinTV HVR-4000-HD
 		0070 9402  WinTV-HVR1100 DVB-T/Hybrid
 		0070 9600  WinTV 88x Audio
 		1462 8606  MSI TV-@nywhere Master
@@ -12078,10 +12286,13 @@
 	6372  MT25408 [ConnectX EN 10GigE 10GBaseT, PCIe 2.0 2.5GT/s]
 	6732  MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
 	673c  MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-	6746  MT25408 [ConnectX EN 40GigE PCIe 2.0 5GT/s]
+	6746  MT26438 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE Virtualization+]
 	6750  MT26448 [ConnectX EN 10GigE, PCIe 2.0 5GT/s]
 	675a  MT25408 [ConnectX EN 10GigE 10GBaseT, PCIe Gen2 5GT/s]
-	6764  MT26468 [ConnectX EN 10GigE, PCIe 2.0 5GT/s]
+	6764  MT26468 [ConnectX EN 10GigE, PCIe 2.0 5GT/s Virtualization+]
+		103c 3313  HP NC542m Dual Port Flex-10 10GbE BLc Adapter
+	676e  MT26478 [ConnectX EN 40GigE, PCIe 2.0 5GT/s]
+	6778  MT26488 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE Virtualization+]
 15b4  CCI/TRIAD
 15b5  Cimetrics Inc
 15b6  Texas Memory Systems Inc
@@ -12099,7 +12310,7 @@
 	0011  XP100 DSP Accelerator [XP100-P1]
 	0012  XP100 DSP Accelerator [XP100-P2]
 	0013  XP100 DSP Accelerator [XP100-P3]
-	0014  RamSan-20 Flash SSD
+	0014  RamSan Flash SSD
 	0015  ZBox
 15b7  Sandisk Corp
 15b8  ADDI-DATA GmbH
@@ -12108,11 +12319,15 @@
 	100a  APCI1696 SP controller (96 TTL I/Os)
 	3001  APCI3501 SP controller (analog output board)
 	300f  APCI3600 Noise and vibration measurement board
+	7001  APCI7420 2-port Serial Controller
+	7002  APCI7300 Serial Controller
 15b9  Maestro Digital Communications
 15ba  Impacct Technology Corp
 15bb  Portwell Inc
 15bc  Agilent Technologies
 	0103  QX4 PCI Express quad 4-gigabit Fibre Channel controller
+	0105  Celerity FC-42XS Fibre Channel Adapter
+		117c 0022  Celerity FC-42XS Fibre Channel Adapter
 	1100  E8001-66442 PCI Express CIC
 	2922  64 Bit, 133MHz PCI-X Exerciser & Protocol Checker
 	2928  64 Bit, 66MHz PCI Exerciser & Analyzer
@@ -12359,6 +12574,7 @@
 	0029  AR922X Wireless Network Adapter
 	002a  AR928X Wireless Network Adapter (PCI-Express)
 	002b  AR9285 Wireless Network Adapter (PCI-Express)
+	002e  AR9287 Wireless Network Adapter
 	0033  11a/b/g/n Wireless LAN Mini-PCI Express Adapter
 	0207  AR5210
 	1014  AR5212 802.11abg NIC
@@ -12442,12 +12658,14 @@
 16da  Advantech Co., Ltd.
 	0011  INES GPIB-PCI
 16df  PIKA Technologies Inc.
+16e2  Geotest-MTS
 16e3  European Space Agency
 	1e0f  LEON2FT Processor
 16e5  Intellon Corp.
 	6000  INT6000 Ethernet-to-Powerline Bridge [HomePlug AV]
 	6300  INT6300 Ethernet-to-Powerline Bridge [HomePlug AV]
 16ec  U.S. Robotics
+	00ed  USR997900
 	0116  USR997902 10/100/1000 Mbps PCI Network Card
 	2f00  USR5660A (USR265660A, USR5660A-BP) 56K PCI Faxmodem
 	3685  Wireless Access PCI Adapter Model 022415
@@ -12562,6 +12780,7 @@
 	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
@@ -12592,6 +12811,7 @@
 	1230  ARC-1230 12-Port PCI-Express to SATA RAID Controller
 	1260  ARC-1260 16-Port PCI-Express to SATA RAID Controller
 	1280  ARC-1231 12-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
 # Nee S2io Inc.
 17d5  Neterion Inc.
@@ -12856,8 +13076,9 @@
 	0051  NT20-X Capture Card
 	0061  NT20E Capture Card
 	0071  NT4E Capture Card
-	0081  NT4E 8-port Expansion Card
+	0081  NT4E 4-port Expansion Card
 	0091  NT20X Capture Card [New Rev]
+	00a1  NT4E-STD Capture Card
 18f6  NextIO
 	1000  [Nexsis] Switch Virtual P2P PCIe Bridge
 	1050  [Nexsis] Switch Virtual P2P PCI Bridge
@@ -12877,6 +13098,11 @@
 	0015  SuperFSCC-104
 	0016  Fastcom FSCC-232
 	0017  SuperFSCC-104-NOUART
+	0018  SuperFSCC/4
+	0019  SuperFSCC-104
+	001a  SuperFSCC-104-LVDS
+	001b  FSCC/4
+	001c  SuperFSCC/4-LVDS
 18fb  Resilience Corporation
 1904  Hangzhou Silan Microelectronics Co., Ltd.
 	2031  SC92031 PCI Fast Ethernet Adapter
@@ -12890,7 +13116,6 @@
 	0100  A104d QUAD T1/E1 AFT card
 	0300  A101 single-port T1/E1
 	0400  A104u Quad T1/E1 AFT
-# nee Level 5 Networks
 1924  Solarflare Communications
 	0703  SFC4000 rev A net [Solarstorm]
 		10b8 0102  SMC10GPCIe-10BT (A2) [TigerCard]
@@ -12921,6 +13146,14 @@
 		1924 5105  SFN4111T-R5
 		1924 5201  SFN4112F-R1
 		1924 5202  SFN4112F-R2
+	0803  SFC9020 [Solarstorm]
+		1924 6200  SFN5122F-R0
+		1924 6201  SFN5122F-R1
+		1924 6202  SFN5122F-R2
+		1924 6203  SFN5122F-R3
+		1924 6204  SFN5122F-R4
+	0813  SFL9021 [Solarstorm]
+		1924 6100  SFN5121T-R0
 	6703  SFC4000 rev A iSCSI/Onload [Solarstorm]
 		10b8 0102  SMC10GPCIe-10BT (A2) [TigerCard]
 		10b8 0103  SMC10GPCIe-10BT (A3) [TigerCard]
@@ -12983,6 +13216,8 @@
 	0061  MPC8569E
 	0070  P2020E
 	0071  P2020
+	0078  P2010E
+	0079  P2010
 	0080  MPC8349E
 	0081  MPC8349
 	0082  MPC8347E TBGA
@@ -12991,6 +13226,18 @@
 	0085  MPC8347 PBGA
 	0086  MPC8343E
 	0087  MPC8343
+	0100  P1020E
+	0101  P1020
+	0108  P1011E
+	0109  P1011
+	0110  P1022E
+	0111  P1022
+	0118  P1013E
+	0119  P1013
+	0400  P4080E
+	0401  P4080
+	0408  P4040E
+	0409  P4040
 	7010  MPC8641 PCI Host Bridge
 	7011  MPC8641D PCI Host Bridge
 	7018  MPC8610
@@ -13032,12 +13279,12 @@
 1974  TransferZentrum Mikroelektronik
 1977  Parsec
 197b  JMicron Technology Corp.
-	0250  JMC250 PCI Express Gigabit Ethernet
-	0260  JMC260 PCI Express Fast Ethernet
-	2360  JMicron 20360/20363 AHCI Controller
+	0250  JMC250 PCI Express Gigabit Ethernet Controller
+	0260  JMC260 PCI Express Fast Ethernet Controller
+	2360  JMB360 AHCI Controller
 	2361  JMB361 AHCI/IDE
 		1462 7235  P965 Neo MS-7235 mainboard
-	2363  20360/20363 Serial ATA Controller
+	2363  JMB362/JMB363 Serial ATA Controller
 		1043 81e4  P5B [JMB363]
 		1458 b000  GA-EP45-DS5 Motherboard
 		1849 2363  Motherboard (one of many)
@@ -13062,6 +13309,9 @@
 198a  Nallatech Ltd.
 1993  Innominate Security Technologies AG
 199a  Pulse-LINK, Inc.
+199d  Xsigo Systems
+	8209  Virtual NIC Device
+	890a  Virtual HBA Device
 199f  Auvitek
 	8501  AU85X1 PCI REV1.1
 19a2  ServerEngines Corp.
@@ -13069,6 +13319,8 @@
 	0201  BladeEngine 10Gb PCIe Network Adapter
 	0211  BladeEngine2 10Gb Gen2 PCIe Network Adapter
 	0212  BladeEngine2 10Gb Gen2 PCIe iSCSI Adapter
+	0221  BladeEngine3 10Gb Gen2 PCIe Network Adapter
+	0222  BladeEngine3 10Gb Gen2 PCIe iSCSI Adapter
 	0700  Emulex OneConnect 10Gb NIC
 	0702  Emulex OneConnect 10Gb iSCSI Initiator
 	0704  Emulex OneConnect 10Gb FCoE Initiator
@@ -13182,6 +13434,8 @@
 1b40  Schooner Information Technology, Inc.
 1b55  NetUP Inc.
 	2a2c  Dual DVB-S2-CI card
+	e2e4  Dual DVB-T/C-CI RF card
+1bad  ReFLEX CES
 1c1c  Symphony
 	0001  82C101
 1d44  DPT
@@ -13670,6 +13924,7 @@
 	8d02  VT8636A [ProSavage KN133] AGP4X VGA Controller (TwisterK)
 	8d03  VT8751 [ProSavageDDR P4M266]
 	8d04  VT8375 [ProSavage8 KM266/KL266]
+	8e40  2300E Graphics Processor
 	8e48  Chrome S27 PCIE
 		5333 0130  Chrome S27 256M DDR2
 	9102  86C410 Savage 2000
@@ -13739,24 +13994,50 @@
 	0007  82379AB
 	0008  Extended Express System Support Controller
 	0039  21145 Fast Ethernet
-	0040  Clarkdake DRAM Controller
-	0041  Clarkdale PCI Express x16 Root Port
-	0042  Clarkdale Integrated Graphics Controller
-	0043  Clarkdale Secondary PCI Express Root Port
-	0044  Arrandale DRAM Controller
-	0045  Arrandale PCI Express x16 Root Port
-	0046  Arrandale Integrated Graphics Controller
-	0047  Arrandale Secondary PCI Express Root Port
-	0048  Arrandale/Clarkdale DRAM Controller
-	0050  Arrandale/Clarkdale Thermal Management Controller
-	0082  WiFi Link 6000 Series
-	0083  WiFi Link 100 Series
-	0084  WiFi Link 100 Series
-	0085  WiFi Link 6000 Series
-	0086  WiMAX/WiFi Link 6050 Series
+	0040  Core Processor DRAM Controller
+	0041  Core Processor PCI Express x16 Root Port
+	0042  Core Processor Integrated Graphics Controller
+	0043  Core Processor Secondary PCI Express Root Port
+	0044  Core Processor DRAM Controller
+	0045  Core Processor PCI Express x16 Root Port
+	0046  Core Processor Integrated Graphics Controller
+	0047  Core Processor Secondary PCI Express Root Port
+	0048  Core Processor DRAM Controller
+	0049  Core Processor PCI Express x16 Root Port
+	004a  Core Processor Integrated Graphics Controller
+	004b  Core Processor Secondary PCI Express Root Port
+	0050  Core Processor Thermal Management Controller
+	0083  WiFi Link 1000 Series
+		8086 1205  WiFi Link 1000 Series 1000BGN
+		8086 1206  WiFi Link 1000 Series 1000BG
+		8086 1225  WiFi Link 1000 Series 1000BGN
+		8086 1226  WiFi Link 1000 Series 1000BG
+		8086 1305  WiFi Link 1000 Series 1000BGN
+		8086 1306  WiFi Link 1000 Series 1000BG
+		8086 1325  WiFi Link 1000 Series 1000BGN
+		8086 1326  WiFi Link 1000 Series 1000BG
+	0084  WiFi Link 1000 Series
+		8086 1215  WiFi Link 1000 Series 1000BGN
+		8086 1216  WiFi Link 1000 Series 1000BG
+		8086 1315  WiFi Link 1000 Series 1000BGN
+		8086 1316  WiFi Link 1000 Series 1000BG
 	0087  WiMAX/WiFi Link 6050 Series
-	0088  WiMAX/WiFi Link 6050 Series
+		8086 1301  WiFi Link 6050 Series 2x2 6050AGN
+		8086 1306  WiFi Link 6050 Series 2x2 6050ABG
+		8086 1321  WiFi Link 6050 Series 2x2 6050AGN
+		8086 1326  WiFi Link 6050 Series 2x2 6050ABG
 	0089  WiMAX/WiFi Link 6050 Series
+		8086 1311  WiFi Link 6050 Series 2x2 6050AGN
+		8086 1316  WiFi Link 6050 Series 2x2 6050ABG
+	0102  Sandy Bridge Integrated Graphics Controller
+	0103  Sandy Bridge Thermal Management Controller
+	0105  Sandy Bridge PCI Express Root Port
+	0106  Sandy Bridge Integrated Graphics Controller
+	0109  Sandy Bridge PCI Express Root Port
+	010a  Sandy Bridge Integrated Graphics Controller
+	010b  Sandy Bridge Integrated Graphics Controller
+	010d  Sandy Bridge PCI Express Root Port
+	010e  Sandy Bridge Integrated Graphics Controller
 	0122  82437FX
 	0309  80303 I/O Processor PCI-to-PCI Bridge
 	030d  80312 I/O Companion Chip PCI-to-PCI Bridge
@@ -13817,6 +14098,7 @@
 		8086 01f7  SCRU32
 # uninitialized SRCU32 RAID Controller
 	061f  80303 I/O Processor
+	0800  SPI Ctrl 0
 	0960  80960RP (i960RP) Microprocessor/Bridge
 	0962  80960RM (i960RM) Bridge
 	0964  80960RP (i960RP) Microprocessor/Bridge
@@ -13919,7 +14201,7 @@
 	1019  82547EI Gigabit Ethernet Controller
 		1458 1019  GA-8IPE1000 Pro2 motherboard (865PE)
 		1458 e000  Intel Gigabit Ethernet (Kenai II)
-		8086 1019  ASUS PC-DL Deluxe mainboard (Socket 603)
+		8086 1019  PRO/1000 CT Desktop Connection
 		8086 301f  D865PERL mainboard
 		8086 3025  D875PBZ motherboard
 		8086 302c  Intel 82865G Mainboard (D865GBF)
@@ -14163,7 +14445,6 @@
 		8086 11bc  PRO/1000 PT Quad Port LP Server Adapter
 	10bd  82566DM-2 Gigabit Network Connection
 		1028 0211  OptiPlex 755
-	10be  82567 Gigabit Network Connection
 	10bf  82567LF Gigabit Network Connection
 	10c0  82562V-2 10/100 Network Connection
 	10c2  82562G-2 10/100 Network Connection
@@ -14187,6 +14468,7 @@
 		103c 31ef  NC362i Integrated Dual port Gigabit Server Adapter
 		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
 		8086 a01c  Gigabit ET Dual Port Server Adapter
 		8086 a03c  Gigabit ET Dual Port Server Adapter
 	10ca  82576 Virtual Function
@@ -14240,6 +14522,8 @@
 	10f6  82574L Gigabit Network Connection
 	10f7  82599EB 10-Gigabit KX4 Network Connection
 		8086 000d  Ethernet Mezzanine Adapter X520-KX4-2
+	10f8  82599EB 10 Gigabit Dual Port Backplane Connection
+	10f9  82599EB 10 Gigabit CX4 Dual Port Network Connection
 	10fb  82599EB 10-Gigabit Network Connection
 		108e 7b11  Ethernet Server Adapter X520-2
 		8086 0002  Ethernet Server Adapter X520-DA2
@@ -14247,6 +14531,7 @@
 		8086 0006  Ethernet Server Adapter X520-1
 		8086 000a  Ethernet Server Adapter X520-1
 		8086 000c  Ethernet Server Adapter X520-2
+		8086 7a11  Ethernet Server Adapter X520-2
 	10fc  82599EB 10-Gigabit Dual Port Network Connection
 	10fe  82552 10/100 Network Connection
 	1107  PRO/1000 MF Server Adapter (LX)
@@ -14467,6 +14752,8 @@
 		15d9 3480  P4DP6
 		4c53 1090  Cx9/Vx9 mainboard
 	1462  82870P2 P64H2 Hot Plug Controller
+	1501  82567V-3 Gigabit Network Connection
+	1507  82599EB 10 Gigabit Network Connection
 	1508  82598EB Gigabit BX Network Connection
 	150a  82576NS Gigabit Network Connection
 	150b  82598EB 10-Gigabit AT2 Server Adapter
@@ -14474,6 +14761,22 @@
 		8086 a11c  82598EB 10-Gigabit AT2 Server Adapter
 		8086 a12c  82598EB 10-Gigabit AT2 Server Adapter
 	150c  82583V Gigabit Network Connection
+	150d  82576 Gigabit Backplane Connection
+		8086 a10c  Gigabit ET Quad Port Mezzanine Card
+	150e  82580 Gigabit Network Connection
+		8086 12a1  Ethernet Server Adapter I340-T4
+		8086 12a2  Ethernet Server Adapter I340-T4
+	150f  82580 Gigabit Fiber Network Connection
+	1510  82580 Gigabit Backplane Connection
+	1511  82580 Gigabit SFP Connection
+	1514  10 Gigabit KX4 Network Connection
+		8086 000b  Ethernet X520 10GbE Dual Port KX4 Mezz
+	1516  82580 Gigabit Network Connection
+		8086 12b1  Ethernet Server Adapter I340-T2
+		8086 12b2  Ethernet Server Adapter I340-T2
+	1517  82599ES 10 Gigabit Network Connection
+		1137 006a  UCS CNA M61KR-I Intel Converged Network Adapter
+	1518  82576NS SerDes Gigabit Network Connection
 	1960  80960RP (i960RP) Microprocessor
 		101e 0431  MegaRAID 431 RAID Controller
 		101e 0438  MegaRAID 438 Ultra2 LVD RAID Controller
@@ -14517,6 +14820,47 @@
 	1b48  82597EX 10GbE Ethernet Controller
 		8086 a01f  PRO/10GbE LR Server Adapter
 		8086 a11f  PRO/10GbE LR Server Adapter
+	1c00  Cougar Point 4 port SATA IDE Controller
+	1c01  Cougar Point 4 port SATA IDE Controller
+	1c02  Cougar Point 6 port SATA AHCI Controller
+	1c03  Cougar Point 6 port SATA AHCI Controller
+	1c04  Cougar Point SATA RAID Controller
+	1c05  Cougar Point SATA RAID Controller
+	1c06  Cougar Point SATA Premium RAID Controller
+	1c07  Cougar Point SATA Premium RAID Controller
+	1c08  Cougar Point 2 port SATA IDE Controller
+	1c09  Cougar Point 2 port SATA IDE Controller
+	1c10  Cougar Point PCI Express Root Port 1
+	1c12  Cougar Point PCI Express Root Port 2
+	1c14  Cougar Point PCI Express Root Port 3
+	1c16  Cougar Point PCI Express Root Port 4
+	1c18  Cougar Point PCI Express Root Port 5
+	1c1a  Cougar Point PCI Express Root Port 6
+	1c1c  Cougar Point PCI Express Root Port 7
+	1c1e  Cougar Point PCI Express Root Port 8
+	1c20  Cougar Point High Definition Audio Controller
+	1c22  Cougar Point SMBus Controller
+	1c24  Cougar Point Thermal Management Controller
+	1c25  Cougar Point DMI to PCI Bridge
+	1c26  Cougar Point USB Enhanced Host Controller #1
+	1c27  Cougar Point USB Universal Host Controller #1
+	1c28  Cougar Point USB Universal Host Controller #2
+	1c29  Cougar Point USB Universal Host Controller #3
+	1c2a  Cougar Point USB Universal Host Controller #4
+	1c2b  Cougar Point USB Universal Host Controller #8
+	1c2c  Cougar Point USB Universal Host Controller #5
+	1c2d  Cougar Point USB Enhanced Host Controller #2
+	1c2e  Cougar Point USB Universal Host Controller #6
+	1c2f  Cougar Point USB Universal Host Controller #7
+	1c30  Cougar Point USB Universal Host Controller #9
+	1c33  Cougar Point LAN Controller
+	1c35  Cougar Point VECI Controller
+	1c3a  Cougar Point HECI Controller #1
+	1c3b  Cougar Point HECI Controller #2
+	1c3c  Cougar Point IDE-r Controller
+	1c3d  Cougar Point KT Controller
+	1c42  Cougar Point LPC Controller
+	1c43  Cougar Point LPC Controller
 	2410  82801AA ISA Bridge (LPC)
 	2411  82801AA IDE Controller
 	2412  82801AA USB Controller
@@ -14918,6 +15262,7 @@
 		1043 80a6  P4P800 series motherboard
 		1458 24d1  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		1462 7650  Hetis 865GV-E (MS-7065)
 		1565 5200  P4TSV Motherboard (865G)
 		15d9 4580  P4SCE Mainboard
 		8086 3427  S875WP1-E mainboard
@@ -14954,6 +15299,7 @@
 		1043 80a6  P4P800 Mainboard
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		1462 7650  Hetis 865GV-E (MS-7065)
 		1565 3101  P4TSV Motherboard (865G)
 		15d9 4580  P4SCE Mainboard
 		1734 101c  PRIMERGY RX/TX S2 series SMBus
@@ -14975,6 +15321,7 @@
 		1043 80a6  P4P800/P5P800 series motherboard
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		1462 7650  Hetis 865GV-E (MS-7065)
 		1565 3101  P4TSV Motherboard (865G)
 		15d9 4580  P4SCE Mainboard
 		1734 101c  PRIMERGY RX/TX S2 series onboard UHCI
@@ -14992,6 +15339,7 @@
 		1458 a002  GA-8IPE1000/8KNXP motherboard
 		1462 0080  865PE Neo2-V (MS-6788) Mainboard
 		1462 7280  865PE Neo2 (MS-6728)
+		1462 7650  Hetis 865GV-E (MS-7065)
 		8086 a000  D865PERL mainboard
 		8086 e000  D865PERL mainboard
 		8086 e001  Desktop Board D865GBF
@@ -15010,6 +15358,7 @@
 		1043 80a6  P4P800/P5P800 series motherboard
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		1462 7650  Hetis 865GV-E (MS-7065)
 		1565 3101  P4TSV Motherboard (865G)
 		15d9 4580  P4SCE Mainboard
 		1734 101c  PRIMERGY RX/TX S2 series onboard UHCI
@@ -15031,6 +15380,7 @@
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
 		1462 7580  MSI 875P
+		1462 7650  Hetis 865GV-E (MS-7065)
 		1565 3101  P4TSV Motherboard (865G)
 		15d9 4580  P4SCE Mainboard
 		1734 101c  PRIMERGY RX/TX S2 series onboard IDE
@@ -15054,6 +15404,7 @@
 		1043 80a6  P4P800/P5P800 series motherboard
 		1458 5006  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		1462 7650  Hetis 865GV-E (MS-7065)
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
 		8086 4c43  Desktop Board D865GLC
@@ -15064,6 +15415,7 @@
 		1043 80a6  P4P800/P5P800 series motherboard
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		1462 7650  Hetis 865GV-E (MS-7065)
 		1565 3101  P4TSV Motherboard (865G)
 		15d9 4580  P4SCE Mainboard
 		1734 101c  PRIMERGY RX/TX S2 series onboard UHCI
@@ -15131,6 +15483,7 @@
 		1028 019d  Dimension 3000
 		103c 12bc  D530 sff(dc578av)
 		1043 80a5  P5P800-MX Mainboard
+		1462 7650  Hetis 865GV-E (MS-7065)
 		1734 101b  Fujitsu-Siemens Scenic E300 i865GV
 		8086 4246  Desktop Board D865GBF
 		8086 4c43  Desktop Board D865GLC
@@ -15708,6 +16061,7 @@
 		10f7 8338  Panasonic CF-Y5 laptop
 		1179 ff10  Toshiba Satellite A100-796 audio (Realtek ALC861)
 		1179 ff31  AC97 Data Fax SoftModem with SmartCP
+		1447 1043  Asus A8JP (Analog Devices AD1986A)
 		1458 a102  GA-8I945PG-RH Mainboard
 		152d 0753  Softmodem
 		1734 10ad  Conexant softmodem SmartCP
@@ -15928,6 +16282,7 @@
 	2916  82801IR (ICH9R) LPC Interface Controller
 	2917  ICH9M-E LPC Interface Controller
 	2918  82801IB (ICH9) LPC Interface Controller
+		1028 0236  PowerEdge R610 82801IB (ICH9) LPC Interface Controller
 	2919  ICH9M LPC Interface Controller
 	2920  82801IR/IO/IH (ICH9R/DO/DH) 4 port SATA IDE Controller
 		1028 020f  PowerEdge R300 onboard SATA Controller
@@ -15949,12 +16304,15 @@
 		1028 0211  Optiplex 755
 	2928  ICH9M/M-E 2 port SATA IDE Controller
 	2929  ICH9M/M-E SATA AHCI Controller
+		103c 3628  dv6-1190en
 	292c  ICH9M-E SATA RAID Controller
 	292d  ICH9M/M-E 2 port SATA IDE Controller
 	292e  ICH9M SATA IDE Controller
 	2930  82801I (ICH9 Family) SMBus Controller
 		1028 0211  Optiplex 755
+		103c 3628  dv6-1190en
 	2932  82801I (ICH9 Family) Thermal Subsystem
+		103c 3628  dv6-1190en
 	2934  82801I (ICH9 Family) USB UHCI Controller #1
 		1028 020f  PowerEdge R300 onboard UHCI
 		1028 0210  PowerEdge T300 onboard UHCI
@@ -16025,6 +16383,7 @@
 		8086 293c  Optiplex 755
 	293e  82801I (ICH9 Family) HD Audio Controller
 		1028 0211  Optiplex 755
+		103c 3628  dv6-1190en
 		8086 293e  Optiplex 755
 		8086 2940  Optiplex 755
 	2940  82801I (ICH9 Family) PCI Express Port 1
@@ -16162,6 +16521,7 @@
 	2a16  Mobile GME965/GLE960 PT IDER Controller
 	2a17  Mobile GME965/GLE960 KT Controller
 	2a40  Mobile 4 Series Chipset Memory Controller Hub
+		e4bf cc4d  CCM-BOOGIE
 	2a41  Mobile 4 Series Chipset PCI Express Graphics Port
 	2a42  Mobile 4 Series Chipset Integrated Graphics Controller
 	2a43  Mobile 4 Series Chipset Integrated Graphics Controller
@@ -16237,14 +16597,14 @@
 	2c33  Xeon 5500/Core i7 Integrated Memory Controller Channel 2 Thermal Control Registers
 	2c40  Xeon 5500/Core i7 QuickPath Architecture Generic Non-Core Registers
 	2c41  Xeon 5500/Core i7 QuickPath Architecture Generic Non-Core Registers
-	2c50  QuickPath Architecture Generic Non-Core Registers
-	2c51  QuickPath Architecture Generic Non-Core Registers
-	2c52  QuickPath Architecture Generic Non-Core Registers
-	2c53  QuickPath Architecture Generic Non-Core Registers
-	2c54  QuickPath Architecture Generic Non-Core Registers
-	2c55  QuickPath Architecture Generic Non-Core Registers
-	2c56  QuickPath Architecture Generic Non-Core Registers
-	2c57  QuickPath Architecture Generic Non-Core Registers
+	2c50  Core Processor QuickPath Architecture Generic Non-Core Registers
+	2c51  Core Processor QuickPath Architecture Generic Non-Core Registers
+	2c52  Core Processor QuickPath Architecture Generic Non-Core Registers
+	2c53  Core Processor QuickPath Architecture Generic Non-Core Registers
+	2c54  Core Processor QuickPath Architecture Generic Non-Core Registers
+	2c55  Core Processor QuickPath Architecture Generic Non-Core Registers
+	2c56  Core Processor QuickPath Architecture Generic Non-Core Registers
+	2c57  Core Processor QuickPath Architecture Generic Non-Core Registers
 	2c58  Jasper Forest QPI Generic Non-core Registers
 	2c59  Jasper Forest QPI Generic Non-core Registers
 	2c5a  Jasper Forest QPI Generic Non-core Registers
@@ -16253,22 +16613,23 @@
 	2c5d  Jasper Forest QPI Generic Non-core Registers
 	2c5e  Jasper Forest QPI Generic Non-core Registers
 	2c5f  Jasper Forest QPI Generic Non-core Registers
-	2c62  QuickPath Architecture Generic Non-core Registers
+	2c61  Core Processor QuickPath Architecture Generic Non-core Registers
+	2c62  Core Processor QuickPath Architecture Generic Non-core Registers
 	2c70  QuickPath Architecture Generic Non-core Registers
-	2c81  QuickPath Architecture System Address Decoder
-	2c90  QPI Link
-	2c91  QPI Physical 0
-	2c98  Lynnfield Integrated Memory Controller
-	2c99  Lynnfield Integrated Memory Controller Target Address Decoder
-	2c9c  Lynnfield Integrated Memory Controller Test Registers
-	2ca0  Lynnfield Integrated Memory Controller Channel 0 Control Registers
-	2ca1  Lynnfield Integrated Memory Controller Channel 0 Address Registers
-	2ca2  Lynnfield Integrated Memory Controller Channel 0 Rank Registers
-	2ca3  Lynnfield Integrated Memory Controller Channel 0 Thermal Control Registers
-	2ca8  Lynnfield Integrated Memory Controller Channel 1 Control Registers
-	2ca9  Lynnfield Integrated Memory Controller Channel 1 Address Registers
-	2caa  Lynnfield Integrated Memory Controller Channel 1 Rank Registers
-	2cab  Lynnfield Integrated Memory Controller Channel 1 Thermal Control Registers
+	2c81  Core Processor QuickPath Architecture System Address Decoder
+	2c90  Core Processor QPI Link 0
+	2c91  Core Processor QPI Physical 0
+	2c98  Core Processor Integrated Memory Controller
+	2c99  Core Processor Integrated Memory Controller Target Address Decoder
+	2c9c  Core Processor Integrated Memory Controller Test Registers
+	2ca0  Core Processor Integrated Memory Controller Channel 0 Control Registers
+	2ca1  Core Processor Integrated Memory Controller Channel 0 Address Registers
+	2ca2  Core Processor Integrated Memory Controller Channel 0 Rank Registers
+	2ca3  Core Processor Integrated Memory Controller Channel 0 Thermal Control Registers
+	2ca8  Core Processor Integrated Memory Controller Channel 1 Control Registers
+	2ca9  Core Processor Integrated Memory Controller Channel 1 Address Registers
+	2caa  Core Processor Integrated Memory Controller Channel 1 Rank Registers
+	2cab  Core Processor Integrated Memory Controller Channel 1 Thermal Control Registers
 	2cc1  Jasper Forest QPI System Address Decoder
 	2cd0  Jasper Forest QPI Link 0
 	2cd1  Jasper Forest QPI Physical 0
@@ -16290,9 +16651,11 @@
 	2cf1  Jasper Forest Integrated Memory Controller Channel 2 Address
 	2cf2  Jasper Forest Integrated Memory Controller Channel 2 Rank
 	2cf3  Jasper Forest Integrated Memory Controller Channel 2 Thermal Control
-	2d01  QuickPath Architecture System Address Decoder
-	2d10  QPI Link 0
-	2d11  QPI Physical 0
+	2d01  Core Processor QuickPath Architecture System Address Decoder
+	2d10  Core Processor QPI Link 0
+	2d11  Core Processor QPI Physical 0
+	2d12  Core Processor Reserved
+	2d13  Core Processor Reserved
 	2d81  QuickPath Architecture System Address Decoder
 	2d90  QPI Link 0
 	2d91  QPI Physical 0
@@ -16389,11 +16752,12 @@
 	3401  5520/5500/X58 I/O Hub to ESI Port
 	3402  5520/5500/X58 I/O Hub to ESI Port
 	3403  5500 I/O Hub to ESI Port
+		1028 0236  PowerEdge R610 I/O Hub to ESI Port
 		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
 	3404  5520/5500/X58 I/O Hub to ESI Port
-	3405  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
 	3407  5520/5500/X58 I/O Hub to ESI Port
 	3408  5520/5500/X58 I/O Hub PCI Express Root Port 1
@@ -16587,6 +16951,7 @@
 	371a  Jasper Forest QPI Link
 	371b  Jasper Forest QPI Routing and Protocol
 	371d  Jasper Forest QPI Routing and Protocol
+	3720  Jasper Forest PCI Express Root Port 0
 	3721  Jasper Forest PCI Express Root Port 1
 	3722  Jasper Forest PCI Express Root Port 2
 	3723  Jasper Forest PCI Express Root Port 3
@@ -16611,7 +16976,7 @@
 		1458 5001  GA-EP45-DS5 Motherboard
 	3a18  82801JIB (ICH10) LPC Interface Controller
 	3a1a  82801JD (ICH10D) LPC Interface Controller
-	3a20  82801JI (ICH10 Family) 4 port SATA IDE Controller
+	3a20  82801JI (ICH10 Family) 4 port SATA IDE Controller #1
 		1028 028c  PowerEdge R410 SATA IDE Controller
 		1028 028d  PowerEdge T410 SATA IDE Controller
 	3a22  82801JI (ICH10 Family) SATA AHCI Controller
@@ -16621,7 +16986,7 @@
 		1028 028c  PERC S100 Controller (PE R410)
 		1028 028d  PERC S100 Controller (PE T410)
 		1028 02f1  PERC S100 Controller (PE R510)
-	3a26  82801JI (ICH10 Family) 2 port SATA IDE Controller
+	3a26  82801JI (ICH10 Family) 2 port SATA IDE Controller #2
 		1028 028c  PowerEdge R410 SATA IDE Controller
 		1028 028d  PowerEdge T410 SATA IDE Controller
 	3a30  82801JI (ICH10 Family) SMBus Controller
@@ -16661,17 +17026,22 @@
 		1458 5006  GA-EP45-DS5 Motherboard
 	3a3e  82801JI (ICH10 Family) HD Audio Controller
 		1458 a102  GA-EP45-DS5 Motherboard
-	3a40  82801JI (ICH10 Family) PCI Express Port 1
+	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
+		1043 82ea  P6T DeLuxe Motherboard
 		1458 5001  GA-EP45-DS5 Motherboard
 	3a42  82801JI (ICH10 Family) PCI Express Port 2
-	3a44  82801JI (ICH10 Family) PCI Express Port 3
-	3a46  82801JI (ICH10 Family) PCI Express Port 4
+	3a44  82801JI (ICH10 Family) PCI Express Root Port 3
+		1043 82ea  P6T DeLuxe Motherboard
+	3a46  82801JI (ICH10 Family) PCI Express Root Port 4
+		1043 82ea  P6T DeLuxe Motherboard
 		1458 5001  GA-EP45-DS5 Motherboard
-	3a48  82801JI (ICH10 Family) PCI Express Port 5
+	3a48  82801JI (ICH10 Family) PCI Express Root Port 5
+		1043 82ea  P6T Deluxe Motherboard
 		1458 5001  GA-EP45-DS5 Motherboard
-	3a4a  82801JI (ICH10 Family) PCI Express Port 6
+	3a4a  82801JI (ICH10 Family) PCI Express Root Port 6
+		1043 82ea  P6T DeLuxe Motherboard
 		1458 5001  GA-EP45-DS5 Motherboard
 	3a4c  82801JI (ICH10 Family) Gigabit Ethernet Controller
 	3a51  82801JDO (ICH10DO) VECI Controller
@@ -16694,86 +17064,78 @@
 	3a78  82801JD/DO (ICH10 Family) PCI Express Port 5
 	3a7a  82801JD/DO (ICH10 Family) PCI Express Port 6
 	3a7c  82801JD/DO (ICH10 Family) Gigabit Ethernet Controller
-	3b00  Ibex Peak LPC Interface Controller
-	3b01  Ibex Peak LPC Interface Controller
-	3b02  Ibex Peak LPC Interface Controller
-	3b03  Ibex Peak LPC Interface Controller
-	3b04  Ibex Peak LPC Interface Controller
-	3b05  Ibex Peak LPC Interface Controller
-	3b06  Ibex Peak LPC Interface Controller
-	3b07  Ibex Peak LPC Interface Controller
-	3b08  Ibex Peak LPC Interface Controller
-	3b09  Ibex Peak LPC Interface Controller
-	3b0a  Ibex Peak LPC Interface Controller
-	3b0b  Ibex Peak LPC Interface Controller
-	3b0c  Ibex Peak LPC Interface Controller
-	3b0d  Ibex Peak LPC Interface Controller
-	3b0e  Ibex Peak LPC Interface Controller
-	3b0f  Ibex Peak LPC Interface Controller
-	3b10  Ibex Peak LPC Interface Controller
-	3b11  Ibex Peak LPC Interface Controller
-	3b12  Ibex Peak LPC Interface Controller
-	3b13  Ibex Peak LPC Interface Controller
-	3b14  Ibex Peak LPC Interface Controller
-	3b15  Ibex Peak LPC Interface Controller
-	3b16  Ibex Peak LPC Interface Controller
-	3b17  Ibex Peak LPC Interface Controller
-	3b18  Ibex Peak LPC Interface Controller
-	3b19  Ibex Peak LPC Interface Controller
-	3b1a  Ibex Peak LPC Interface Controller
-	3b1b  Ibex Peak LPC Interface Controller
-	3b1c  Ibex Peak LPC Interface Controller
-	3b1d  Ibex Peak LPC Interface Controller
-	3b1e  Ibex Peak LPC Interface Controller
-	3b1f  Ibex Peak LPC Interface Controller
-	3b20  Ibex Peak 4 port SATA IDE Controller
-	3b21  Ibex Peak 2 port SATA IDE Controller
-	3b22  Ibex Peak 6 port SATA AHCI Controller
-	3b23  Ibex Peak 4 port SATA AHCI Controller
-	3b24  Ibex Peak SATA Enhanced RAID Controller
-		1028 02a4  PERC S100 Controller (PE T310)
-		1028 02a5  PERC S100 Controller (PE R210)
-		1028 02a6  PERC S100 Controller (PE T110)
-	3b25  Ibex Peak SATA RAID Controller
-		1028 02a4  PERC S100 Controller (PE T310)
-		1028 02a5  PERC S100 Controller
-		1028 02a6  PERC S100 Controller (PE T110)
-	3b26  Ibex Peak 2 port SATA IDE Controller
-	3b28  Ibex Peak 4 port SATA IDE Controller
-	3b29  Ibex Peak 4 port SATA AHCI Controller
-	3b2b  Ibex Peak SATA Enhanced RAID Controller
-	3b2c  Ibex Peak SATA RAID Controller
-	3b2d  Ibex Peak 2 port SATA IDE Controller
-	3b2e  Ibex Peak 4 port SATA IDE Controller
-	3b2f  Ibex Peak 6 port SATA AHCI Controller
-	3b30  Ibex Peak SMBus Controller
-	3b32  Ibex Peak Thermal Subsystem
-	3b34  Ibex Peak USB2 Enhanced Host Controller
-	3b36  Ibex Peak USB Universal Host Controller
-	3b37  Ibex Peak USB Universal Host Controller
-	3b38  Ibex Peak USB Universal Host Controller
-	3b39  Ibex Peak USB Universal Host Controller
-	3b3a  Ibex Peak USB Universal Host Controller
-	3b3b  Ibex Peak USB Universal Host Controller
-	3b3c  Ibex Peak USB2 Enhanced Host Controller
-	3b3e  Ibex Peak USB Universal Host Controller
-	3b3f  Ibex Peak USB Universal Host Controller
-	3b40  Ibex Peak USB Universal Host Controller
-	3b41  Ibex Peak LAN Controller
-	3b42  Ibex Peak PCI Express Root Port 1
-	3b44  Ibex Peak PCI Express Root Port 2
-	3b46  Ibex Peak PCI Express Root Port 3
-	3b48  Ibex Peak PCI Express Root Port 4
-	3b4a  Ibex Peak PCI Express Root Port 5
-	3b4c  Ibex Peak PCI Express Root Port 6
-	3b4e  Ibex Peak PCI Express Root Port 7
-	3b50  Ibex Peak PCI Express Root Port 8
-	3b53  Ibex Peak VECI Controller
-	3b56  Ibex Peak High Definition Audio
-	3b64  Ibex Peak HECI Controller
-	3b65  Ibex Peak HECI Controller
-	3b66  Ibex Peak PT IDER Controller
-	3b67  Ibex Peak KT Controller
+	3b00  5 Series/3400 Series Chipset LPC Interface Controller
+	3b01  Mobile 5 Series Chipset LPC Interface Controller
+	3b02  5 Series Chipset LPC Interface Controller
+	3b03  Mobile 5 Series Chipset LPC Interface Controller
+	3b04  5 Series Chipset LPC Interface Controller
+	3b05  Mobile 5 Series Chipset LPC Interface Controller
+	3b06  5 Series Chipset LPC Interface Controller
+	3b07  Mobile 5 Series Chipset LPC Interface Controller
+	3b08  5 Series Chipset LPC Interface Controller
+	3b09  Mobile 5 Series Chipset LPC Interface Controller
+	3b0a  5 Series Chipset LPC Interface Controller
+	3b0b  Mobile 5 Series Chipset LPC Interface Controller
+	3b0c  5 Series Chipset LPC Interface Controller
+	3b0d  5 Series/3400 Series Chipset LPC Interface Controller
+	3b0e  5 Series/3400 Series Chipset LPC Interface Controller
+	3b0f  5 Series/3400 Series Chipset LPC Interface Controller
+	3b10  5 Series/3400 Series Chipset LPC Interface Controller
+	3b11  5 Series/3400 Series Chipset LPC Interface Controller
+	3b12  3400 Series Chipset LPC Interface Controller
+	3b13  5 Series/3400 Series Chipset LPC Interface Controller
+	3b14  3400 Series Chipset LPC Interface Controller
+	3b15  5 Series/3400 Series Chipset LPC Interface Controller
+	3b16  3400 Series Chipset LPC Interface Controller
+	3b17  5 Series/3400 Series Chipset LPC Interface Controller
+	3b18  5 Series/3400 Series Chipset LPC Interface Controller
+	3b19  5 Series/3400 Series Chipset LPC Interface Controller
+	3b1a  5 Series/3400 Series Chipset LPC Interface Controller
+	3b1b  5 Series/3400 Series Chipset LPC Interface Controller
+	3b1c  5 Series/3400 Series Chipset LPC Interface Controller
+	3b1d  5 Series/3400 Series Chipset LPC Interface Controller
+	3b1e  5 Series/3400 Series Chipset LPC Interface Controller
+	3b1f  5 Series/3400 Series Chipset LPC Interface Controller
+	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
+	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
+	3b28  5 Series/3400 Series Chipset 4 port SATA IDE Controller
+	3b29  5 Series/3400 Series Chipset 4 port SATA AHCI Controller
+	3b2c  5 Series/3400 Series Chipset SATA RAID Controller
+	3b2d  5 Series/3400 Series Chipset 2 port SATA IDE Controller
+	3b2e  5 Series/3400 Series Chipset 4 port SATA IDE Controller
+	3b2f  5 Series/3400 Series Chipset 6 port SATA AHCI Controller
+	3b30  5 Series/3400 Series Chipset SMBus Controller
+	3b32  5 Series/3400 Series Chipset Thermal Subsystem
+	3b34  5 Series/3400 Series Chipset USB2 Enhanced Host Controller
+	3b36  5 Series/3400 Series Chipset USB Universal Host Controller
+	3b37  5 Series/3400 Series Chipset USB Universal Host Controller
+	3b38  5 Series/3400 Series Chipset USB Universal Host Controller
+	3b39  5 Series/3400 Series Chipset USB Universal Host Controller
+	3b3a  5 Series/3400 Series Chipset USB Universal Host Controller
+	3b3b  5 Series/3400 Series Chipset USB Universal Host Controller
+	3b3c  5 Series/3400 Series Chipset USB2 Enhanced Host Controller
+	3b3e  5 Series/3400 Series Chipset USB Universal Host Controller
+	3b3f  5 Series/3400 Series Chipset USB Universal Host Controller
+	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
+	3b44  5 Series/3400 Series Chipset PCI Express Root Port 2
+	3b46  5 Series/3400 Series Chipset PCI Express Root Port 3
+	3b48  5 Series/3400 Series Chipset PCI Express Root Port 4
+	3b4a  5 Series/3400 Series Chipset PCI Express Root Port 5
+	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
+	3b64  5 Series/3400 Series Chipset HECI Controller
+	3b65  5 Series/3400 Series Chipset HECI Controller
+	3b66  5 Series/3400 Series Chipset PT IDER Controller
+	3b67  5 Series/3400 Series Chipset KT Controller
 	4000  5400 Chipset Memory Controller Hub
 	4001  5400 Chipset Memory Controller Hub
 	4003  5400 Chipset Memory Controller Hub
@@ -16794,6 +17156,18 @@
 	4032  5400 Chipset IOxAPIC
 	4035  5400 Chipset FBD Registers
 	4036  5400 Chipset FBD Registers
+	4108  Tunnel Creek Integrated Graphics Controller
+	4109  Tunnel Creek Integrated Graphics Controller
+	410a  Tunnel Creek Integrated Graphics Controller
+	410b  Tunnel Creek Integrated Graphics Controller
+	410c  Tunnel Creek Integrated Graphics Controller
+	410d  Tunnel Creek Integrated Graphics Controller
+	410e  Tunnel Creek Integrated Graphics Controller
+	410f  Tunnel Creek Integrated Graphics Controller
+	4114  Tunnel Creek PCI Host Bridge #1
+	4115  Tunnel Creek PCI Host Bridge #2
+	4116  Tunnel Creek PCI Host Bridge #3
+	4117  Tunnel Creek PCI Host Bridge #4
 	4220  PRO/Wireless 2200BG [Calexico2] Network Connection
 		103c 0934  Compaq nw8240/nx8220
 		103c 12f6  Compaq nw8240/nx8220
@@ -16821,25 +17195,64 @@
 		8086 1014  PRO/Wireless 3945BG Network Connection
 	4229  PRO/Wireless 4965 AG or AGN [Kedron] Network Connection
 	422b  WiFi Link 6000 Series
+		8086 1101  WiFi Link 6000 Series 3x3 6000AGN
+		8086 1121  WiFi Link 6000 Series 3x3 6000AGN
+	422c  WiFi Link 6000 Series
+		8086 1301  WiFi Link 6000 Series 2x2 6000AGN
+		8086 1306  WiFi Link 6000 Series 2x2 6000ABG
+		8086 1307  WiFi Link 6000 Series 2x2 6000BG
+		8086 1321  WiFi Link 6000 Series 2x2 6000AGN
+		8086 1326  WiFi Link 6000 Series 2x2 6000ABG
 	4230  PRO/Wireless 4965 AG or AGN [Kedron] Network Connection
 		8086 1110  Lenovo ThinkPad T51
 		8086 1111  Lenovo ThinkPad T61
 	4232  Wireless WiFi Link 5100
-		8086 1205  PRO/Wireless 5100BG Network Connection
+		8086 1201  PRO/Wireless 5100AGN Network Connection
+		8086 1204  PRO/Wireless 5100AGN Network Connection
+		8086 1205  PRO/Wireless 5100BGN Network Connection
 		8086 1206  PRO/Wireless 5100ABG Network Connection
-		8086 1216  PRO/Wireless 5100ABG Network Connection
-		8086 1305  PRO/Wireless 5100BG Network Connection
+		8086 1221  PRO/Wireless 5100AGN Network Connection
+		8086 1224  PRO/Wireless 5100AGN Network Connection
+		8086 1225  PRO/Wireless 5100BGN Network Connection
+		8086 1226  PRO/Wireless 5100ABG Network Connection
+		8086 1301  PRO/Wireless 5100AGN Network Connection
+		8086 1304  PRO/Wireless 5100AGN Network Connection
+		8086 1305  PRO/Wireless 5100BGN Network Connection
 		8086 1306  PRO/Wireless 5100ABG Network Connection
-		8086 1321  Wireless WiFi Link 5100
+		8086 1321  PRO/Wireless 5100AGN Network Connection
+		8086 1324  PRO/Wireless 5100AGN Network Connection
+		8086 1325  PRO/Wireless 5100BGN Network Connection
 		8086 1326  PRO/Wireless 5100ABG Network Connection
 	4235  PRO/Wireless 5300 AGN [Shiloh] Network Connection
 	4236  Wireless WiFi Link 5300
 	4237  PRO/Wireless 5100 AGN [Shiloh] Network Connection
+		8086 1211  PRO/Wireless 5100AGN Network Connection
+		8086 1214  PRO/Wireless 5100AGN Network Connection
+		8086 1215  PRO/Wireless 5100BGN Network Connection
+		8086 1216  PRO/Wireless 5100ABG Network Connection
+		8086 1311  PRO/Wireless 5100AGN Network Connection
+		8086 1314  PRO/Wireless 5100AGN Network Connection
+		8086 1315  PRO/Wireless 5100BGN Network Connection
+		8086 1316  PRO/Wireless 5100ABG Network Connection
 	4238  WiFi Link 6000 Series
+		8086 1111  WiFi Link 6000 Series 3x3 6000AGN
+	4239  WiFi Link 6000 Series
+		8086 1311  WiFi Link 6000 Series 2x2 6000AGN
+		8086 1316  WiFi Link 6000 Series 2x2 6000ABG
 	423a  PRO/Wireless 5350 AGN [Echo Peak] Network Connection
 	423b  PRO/Wireless 5350 AGN [Echo Peak] Network Connection
-	423c  WiMAX/WiFi Link 5050 Series
-	423d  WiMAX/WiFi Link 5050 Series
+	423c  WiMAX/WiFi Link 5150 Series
+		8086 1201  WiMAX/WiFi Link 5150 Series 5150AGN
+		8086 1206  WiMAX/WiFi Link 5150 Series 5150ABG
+		8086 1221  WiMAX/WiFi Link 5150 Series 5150AGN
+		8086 1301  WiMAX/WiFi Link 5150 Series 5150AGN
+		8086 1306  WiMAX/WiFi Link 5150 Series 5150ABG
+		8086 1321  WiMAX/WiFi Link 5150 Series 5150AGN
+	423d  WiMAX/WiFi Link 5150 Series
+		8086 1211  WiMAX/WiFi Link 5150 Series 5150AGN
+		8086 1216  WiMAX/WiFi Link 5150 Series 5150ABG
+		8086 1311  WiMAX/WiFi Link 5150 Series 5150AGN
+		8086 1316  WiMAX/WiFi Link 5150 Series 5150ABG
 	444e  Turbo Memory Controller
 	5001  LE80578
 	5002  LE80578 Graphics Processor Unit
@@ -17013,6 +17426,13 @@
 	811c  System Controller Hub (SCH Poulsbo) SDIO Controller #1
 	811d  System Controller Hub (SCH Poulsbo) SDIO Controller #2
 	811e  System Controller Hub (SCH Poulsbo) SDIO Controller #3
+	8180  Tunnel Creek PCI Express Port 3
+	8181  Tunnel Creek PCI Express Port 4
+	8182  Tunnel Creek Integrated Graphics Controller
+	8183  Tunnel Creek Configuration Unit
+	8184  Tunnel Creek PCI Express Port 1
+	8185  Tunnel Creek PCI Express Port 2
+	8186  Tunnel Creek LPC Bridge
 	84c4  450KX/GX [Orion] - 82454KX/GX PCI bridge
 	84c5  450KX/GX [Orion] - 82453KX/GX Memory controller
 	84ca  450NX - 82451NX Memory & I/O Controller
@@ -17028,6 +17448,32 @@
 		1993 0ded  mGuard-PCI AV#2
 		1993 0dee  mGuard-PCI AV#1
 		1993 0def  mGuard-PCI AV#0
+	8800  Topcliff PCI Express Port
+	8801  Topcliff Packet Hub
+	8802  Topcliff Gigabit Ethernet Controller
+	8803  Topcliff General Purpose IO Controller
+	8804  Topcliff USB OHCI Controller #4
+	8805  Topcliff USB OHCI Controller #5
+	8806  Topcliff USB OHCI Controller #6
+	8807  Topcliff USB2 EHCI Controller #2
+	8808  Topcliff USB Client Controller
+	8809  Topcliff SDIO Controller #1
+	880a  Topcliff SDIO Controller #2
+	880b  Topcliff SATA AHCI Controller
+	880c  Topcliff USB OHCI Controller #1
+	880d  Topcliff USB OHCI Controller #2
+	880e  Topcliff USB OHCI Controller #3
+	880f  Topcliff USB2 EHCI Controller #1
+	8810  Topcliff DMA Controller #1
+	8811  Topcliff UART Controller #1
+	8812  Topcliff UART Controller #2
+	8813  Topcliff UART Controller #3
+	8814  Topcliff UART Controller #4
+	8815  Topcliff DMA Controller #2
+	8816  Topcliff Serial Peripheral Interface Bus
+	8817  Topcliff I2C Controller
+	8818  Topcliff Controller Area Network (CAN) Controller
+	8819  Topcliff IEEE 1588 Hardware Assist
 	9000  IXP2000 Family Network Processor
 	9001  IXP2400 Network Processor
 	9002  IXP2300 Network Processor
@@ -17056,24 +17502,24 @@
 		4c53 1050  CT7 mainboard
 		4c53 1051  CE7 mainboard
 		e4bf 1000  CC8-1-BLUES
-	d130  Clarksfield/Lynnfield DMI
-	d131  Clarksfield/Lynnfield DMI
-	d132  Clarksfield/Lynnfield DMI
-	d133  Clarksfield/Lynnfield DMI
-	d134  Clarksfield/Lynnfield DMI
-	d135  Clarksfield/Lynnfield DMI
-	d136  Clarksfield/Lynnfield DMI
-	d137  Clarksfield/Lynnfield DMI
-	d138  Clarksfield/Lynnfield PCI Express Root Port 1
-	d139  Lynnfield PCI Express Root Port 2
-	d13a  Clarksfield/Lynnfield PCI Express Root Port 3
-	d13b  Lynnfield PCI Express Root Port 4
-	d150  QPI Link
-	d151  QPI Routing and Protocol Registers
-	d155  Clarksfield/Lynnfield System Management Registers
-	d156  Clarksfield/Lynnfield Semaphore and Scratchpad Registers
-	d157  Clarksfield/Lynnfield System Control and Status Registers
-	d158  Clarksfield/Lynnfield Miscellaneous Registers
+	d130  Core Processor DMI
+	d131  Core Processor DMI
+	d132  Core Processor DMI
+	d133  Core Processor DMI
+	d134  Core Processor DMI
+	d135  Core Processor DMI
+	d136  Core Processor DMI
+	d137  Core Processor DMI
+	d138  Core Processor PCI Express Root Port 1
+	d139  Core Processor PCI Express Root Port 2
+	d13a  Core Processor PCI Express Root Port 3
+	d13b  Core Processor PCI Express Root Port 4
+	d150  Core Processor QPI Link
+	d151  Core Processor QPI Routing and Protocol Registers
+	d155  Core Processor System Management Registers
+	d156  Core Processor Semaphore and Scratchpad Registers
+	d157  Core Processor System Control and Status Registers
+	d158  Core Processor Miscellaneous Registers
 80ee  InnoTek Systemberatung GmbH
 	beef  VirtualBox Graphics Adapter
 	cafe  VirtualBox Guest Service
@@ -17399,6 +17845,7 @@
 		9005 0432  ASC-44300 (Spirit-Lite non-RAID)
 	043e  AIC-9405W SAS (Razor-Lite ASIC non-RAID)
 	043f  AIC-9405W SAS (Razor-Lite ASIC RAID)
+	0450  ASC-1405 Unified Serial HBA
 	0500  Obsidian chipset SCSI controller
 		1014 02c1  PCI-X DDR 3Gb SAS Adapter (572A/572C)
 		1014 02c2  PCI-X DDR 3Gb SAS RAID Adapter (572B/572D)
@@ -17488,6 +17935,8 @@
 aa42  Scitex Digital Video
 aa55  Ncomputing X300 PCI-Engine
 aaaa  Adnaco Technology Inc.
+	0001  H1 PCIe over fiber optic host controller
+	0002  R1BP1 PCIe over fiber optic expansion chassis
 abcd  Vadatech Inc.
 ac1e  Digital Receiver Technology Inc
 ac3d  Actuality Systems
@@ -17522,17 +17971,22 @@
 ceba  KEBA AG
 d161  Digium, Inc.
 	0120  Wildcard TE120P single-span T1/E1/J1 card
-	0205  Wildcard TE205P dual-span T1/E1/J1 card 5.0V
-	0210  Wildcard TE210P dual-span T1/E1/J1 card 3.3V
-	0405  Wildcard TE405P quad-span T1/E1/J1 card 5.0V
-	0410  Wildcard TE410P quad-span T1/E1/J1 card 3.3V
+	0205  Wildcard TE205P/TE207P dual-span T1/E1/J1 card 5.0V
+	0210  Wildcard TE210P/TE212P dual-span T1/E1/J1 card 3.3V
+	0220  Wildcard TE220 dual-span T1/E1/J1 card 3.3V (PCI-Express)
+	0405  Wildcard TE405P/TE407P quad-span T1/E1/J1 card 5.0V
+	0410  Wildcard TE410P/TE412P quad-span T1/E1/J1 card 3.3V
+	0420  Wildcard TE420P quad-span T1/E1/J1 card 3.3V (PCI-Express)
 	0800  Wildcard TDM800P 8-port analog card
 	2400  Wildcard TDM2400P 24-port analog card
 	3400  Wildcard TC400P transcoder base card
 	8000  Wildcard TE121 single-span T1/E1/J1 card (PCI-Express)
 	8001  Wildcard TE122 single-span T1/E1/J1 card
 	8002  Wildcard AEX800 8-port analog card (PCI-Express)
-	8005  TDM400P
+	8003  Wildcard AEX2400 24-port analog card (PCI-Express)
+	8004  Wildcard TCE400P transcoder base card
+	8005  Wildcard TDM410 4-port analog card
+	8006  Wildcard AEX410 4-port analog card (PCI-Express)
 	b410  Wildcard B410 quad-BRI card
 d4d4  Dy4 Systems Inc
 	0601  PCI Mezzanine Card
diff -ruN pciutils-3.1.4/pciutils.lsm pciutils-3.1.5/pciutils.lsm
--- pciutils-3.1.4/pciutils.lsm	2009-08-14 14:40:39.000000000 +0200
+++ pciutils-3.1.5/pciutils.lsm	2010-01-19 10:39:55.000000000 +0100
@@ -1,14 +1,14 @@
 Begin3
 Title:          The PCI Utilities
-Version:        3.1.4
-Entered-date:   090814
+Version:        3.1.5
+Entered-date:   100119
 Description:    This package contains various utilities for inspecting and
 		setting of devices connected to the PCI bus.
 Keywords:       kernel, pci, lspci, setpci, libpci
 Author:         mj@ucw.cz (Martin Mares)
 Maintained-by:  mj@ucw.cz (Martin Mares)
-Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-3.1.4.tar.gz
-Alternate-site: ftp.kernel.org pub/software/utils/pciutils/pciutils-3.1.4.tar.gz
-Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-3.1.4.tar.gz
+Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-3.1.5.tar.gz
+Alternate-site: ftp.kernel.org pub/software/utils/pciutils/pciutils-3.1.5.tar.gz
+Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-3.1.5.tar.gz
 Copying-policy: GPL
 End
diff -ruN pciutils-3.1.4/pciutils.spec pciutils-3.1.5/pciutils.spec
--- pciutils-3.1.4/pciutils.spec	2009-08-14 14:40:38.000000000 +0200
+++ pciutils-3.1.5/pciutils.spec	2010-01-19 10:39:55.000000000 +0100
@@ -1,5 +1,5 @@
 Name:		pciutils
-Version:	3.1.4
+Version:	3.1.5
 Release: 	1
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Copyright:	GNU GPL
diff -ruN pciutils-3.1.4/setpci.man pciutils-3.1.5/setpci.man
--- pciutils-3.1.4/setpci.man	2009-08-10 16:28:54.000000000 +0200
+++ pciutils-3.1.5/setpci.man	2009-09-29 18:17:13.000000000 +0200
@@ -124,7 +124,7 @@
 .I data
 and
 .I mask
-are hexdecimal numbers. In the latter case, only the bits corresponding to binary
+are hexadecimal numbers. In the latter case, only the bits corresponding to binary
 ones in the \fImask\fP are changed (technically, this is a read-modify-write operation).
 
 .PP
diff -ruN pciutils-3.1.4/tests/broken-ecaps pciutils-3.1.5/tests/broken-ecaps
--- pciutils-3.1.4/tests/broken-ecaps	1970-01-01 01:00:00.000000000 +0100
+++ pciutils-3.1.5/tests/broken-ecaps	2010-01-19 10:03:38.000000000 +0100
@@ -0,0 +1,257 @@
+00:00.0 Host bridge: ATI Technologies Inc RS690 Host Bridge
+00: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+20: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+30: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+40: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+50: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+60: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+80: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+90: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+a0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+c0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+d0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+e0: 00 00 00 00 00 00 00 00 00 01 00 00 00 d0 ff d7
+f0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+100: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+110: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+120: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+130: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+140: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+150: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+160: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+170: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+180: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+190: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+1a0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+1b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+1c0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+1d0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+1e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+1f0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+200: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+210: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+220: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+230: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+240: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+250: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+260: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+270: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+280: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+290: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+2a0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+2b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+2c0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+2d0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+2e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+2f0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+300: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+310: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+320: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+330: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+340: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+350: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+360: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+370: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+380: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+390: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+3a0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+3b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+3c0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+3d0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+3e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+3f0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+400: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+410: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+420: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+430: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+440: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+450: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+460: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+470: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+480: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+490: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+4a0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+4b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+4c0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+4d0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+4e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+4f0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+500: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+510: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+520: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+530: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+540: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+550: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+560: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+570: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+580: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+590: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+5a0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+5b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+5c0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+5d0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+5e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+5f0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+600: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+610: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+620: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+630: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+640: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+650: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+660: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+670: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+680: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+690: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+6a0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+6b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+6c0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+6d0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+6e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+6f0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+700: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+710: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+720: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+730: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+740: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+750: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+760: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+770: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+780: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+790: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+7a0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+7b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+7c0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+7d0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+7e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+7f0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+800: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+810: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+820: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+830: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+840: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+850: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+860: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+870: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+880: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+890: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+8a0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+8b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+8c0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+8d0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+8e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+8f0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+900: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+910: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+920: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+930: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+940: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+950: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+960: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+970: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+980: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+990: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+9a0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+9b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+9c0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+9d0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+9e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+9f0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+a00: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+a10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+a20: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+a30: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+a40: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+a50: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+a60: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+a70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+a80: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+a90: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+aa0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+ab0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ac0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+ad0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+ae0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+af0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+b00: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+b10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+b20: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+b30: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+b40: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+b50: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+b60: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+b70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+b80: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+b90: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+ba0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+bb0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+bc0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+bd0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+be0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+bf0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+c00: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+c10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+c20: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+c30: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+c40: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+c50: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+c60: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+c70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+c80: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+c90: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+ca0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+cb0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+cc0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+cd0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+ce0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+cf0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+d00: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+d10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+d20: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+d30: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+d40: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+d50: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+d60: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+d70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+d80: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+d90: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+da0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+db0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+dc0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+dd0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+de0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+df0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+e00: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+e10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+e20: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+e30: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+e40: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+e50: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+e60: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+e70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+e80: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+e90: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+ea0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+eb0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ec0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+ed0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+ee0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ef0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
+f00: 02 10 11 79 06 00 20 22 00 00 00 06 00 20 00 00
+f10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+f20: 00 00 00 00 00 00 00 00 00 00 00 00 58 14 00 50
+f30: 00 00 00 00 c4 00 00 00 00 00 00 00 00 00 00 00
+f40: 00 00 00 00 00 00 00 00 00 00 00 00 42 20 05 00
+f50: 58 14 00 50 ff 00 00 00 00 00 00 00 00 00 00 00
+f60: 7d 00 00 00 03 0f 6a 81 00 02 20 00 99 b8 01 00
+f70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+f80: 40 43 00 00 95 00 00 03 20 00 10 00 03 26 00 20
+f90: 00 00 00 d0 40 c5 40 e4 00 00 00 00 01 00 00 00
+fa0: 00 00 00 00 00 00 00 00 07 01 00 00 49 01 10 07
+fb0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+fc0: 00 00 00 00 08 00 80 01 60 00 11 11 d0 00 00 00
+fd0: 25 06 65 00 02 00 00 00 00 00 00 00 00 00 00 00
+fe0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ff0: 00 00 00 00 00 80 80 00 00 00 00 00 00 00 00 00
diff -ruN pciutils-3.1.4/tests/cap-pcie-1 pciutils-3.1.5/tests/cap-pcie-1
--- pciutils-3.1.4/tests/cap-pcie-1	2009-08-10 16:28:54.000000000 +0200
+++ pciutils-3.1.5/tests/cap-pcie-1	2009-08-21 11:55:17.000000000 +0200
@@ -21,11 +21,11 @@
 			MaxPayload 256 bytes, MaxReadReq 128 bytes
 		DevSta:	CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr- TransPend-
 		LnkCap:	Port #1, Speed 5GT/s, Width x4, ASPM L0s L1, Latency L0 <512ns, L1 <4us
-			ClockPM- Suprise+ LLActRep+ BwNot+
+			ClockPM- Surprise+ LLActRep+ BwNot+
 		LnkCtl:	ASPM L1 Enabled; RCB 64 bytes Disabled- Retrain- CommClk+
 			ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt-
 		LnkSta:	Speed 2.5GT/s, Width x4, TrErr- Train- SlotClk+ DLActive+ BWMgmt+ ABWMgmt-
-		SltCap:	AttnBtn+ PwrCtrl+ MRL+ AttnInd+ PwrInd+ HotPlug- Surpise-
+		SltCap:	AttnBtn+ PwrCtrl+ MRL+ AttnInd+ PwrInd+ HotPlug- Surprise-
 			Slot # 40, PowerLimit 0.000000; Interlock+ NoCompl-
 		SltCtl:	Enable: AttnBtn- PwrFlt- MRL- PresDet- CmdCplt- HPIrq- LinkChg-
 			Control: AttnInd Off, PwrInd Off, Power+ Interlock-
diff -ruN pciutils-3.1.4/tests/cap-pcie-2 pciutils-3.1.5/tests/cap-pcie-2
--- pciutils-3.1.4/tests/cap-pcie-2	2009-08-10 16:28:54.000000000 +0200
+++ pciutils-3.1.5/tests/cap-pcie-2	2009-08-21 11:55:17.000000000 +0200
@@ -26,7 +26,7 @@
 			MaxPayload 256 bytes, MaxReadReq 512 bytes
 		DevSta:	CorrErr+ UncorrErr- FatalErr- UnsuppReq+ AuxPwr+ TransPend-
 		LnkCap:	Port #0, Speed 2.5GT/s, Width x4, ASPM L0s L1, Latency L0 <4us, L1 <64us
-			ClockPM- Suprise- LLActRep- BwNot-
+			ClockPM- Surprise- LLActRep- BwNot-
 		LnkCtl:	ASPM L1 Enabled; RCB 64 bytes Disabled- Retrain- CommClk+
 			ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt-
 		LnkSta:	Speed 2.5GT/s, Width x4, TrErr- Train- SlotClk+ DLActive- BWMgmt- ABWMgmt-
diff -ruN pciutils-3.1.4/win32/config.h pciutils-3.1.5/win32/config.h
--- pciutils-3.1.4/win32/config.h	2009-08-14 14:40:38.000000000 +0200
+++ pciutils-3.1.5/win32/config.h	2010-01-19 10:39:55.000000000 +0100
@@ -3,4 +3,4 @@
 #define PCI_HAVE_PM_INTEL_CONF
 #define PCI_IDS "pci.ids"
 #define PCI_PATH_IDS_DIR "."
-#define PCILIB_VERSION "3.1.4"
+#define PCILIB_VERSION "3.1.5"
diff -ruN pciutils-3.1.4/win32/config.mk pciutils-3.1.5/win32/config.mk
--- pciutils-3.1.4/win32/config.mk	2007-09-03 10:44:16.000000000 +0200
+++ pciutils-3.1.5/win32/config.mk	2009-09-16 10:15:35.000000000 +0200
@@ -8,3 +8,6 @@
 PCI_ARCH_I386=yes
 PCI_OS_WINDOWS=yes
 PCI_HAVE_PM_INTEL_CONF=yes
+
+PCILIB=$(LIBNAME).a
+PCILIBPC=$(LIBNAME).pc
