Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI hotplug: Change link order of pciehp & acpiphp
  PCI hotplug: fakephp: Allocate PCI resources before adding the device
  PCI MSI: Fix undefined shift by 32
  PCI PM: Do not wait for buses in B2 or B3 during resume
  PCI PM: Power up devices before restoring their state
  PCI PM: Fix hibernation breakage on EeePC 701
  PCI: irq and pci_ids patch for Intel Tigerpoint DeviceIDs
  PCI PM: Fix suspend error paths and testing facility breakage

diff --combined include/linux/pci_ids.h
index febc10ed3858a474a5d1edf12c8759e133af4fe1,6f260b50253b3adca932b5e1e8d00a51e2c54c0b..52a9fe08451cfa105c733099350355a8b89dc028
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1357,7 -1357,6 +1357,7 @@@
  #define PCI_DEVICE_ID_VIA_8783_0      0x3208
  #define PCI_DEVICE_ID_VIA_8237                0x3227
  #define PCI_DEVICE_ID_VIA_8251                0x3287
 +#define PCI_DEVICE_ID_VIA_8261                0x3402
  #define PCI_DEVICE_ID_VIA_8237A               0x3337
  #define PCI_DEVICE_ID_VIA_8237S               0x3372
  #define PCI_DEVICE_ID_VIA_SATA_EIDE   0x5324
@@@ -1367,13 -1366,10 +1367,13 @@@
  #define PCI_DEVICE_ID_VIA_CX700               0x8324
  #define PCI_DEVICE_ID_VIA_CX700_IDE   0x0581
  #define PCI_DEVICE_ID_VIA_VX800               0x8353
 +#define PCI_DEVICE_ID_VIA_VX855               0x8409
  #define PCI_DEVICE_ID_VIA_8371_1      0x8391
  #define PCI_DEVICE_ID_VIA_82C598_1    0x8598
  #define PCI_DEVICE_ID_VIA_838X_1      0xB188
  #define PCI_DEVICE_ID_VIA_83_87XX_1   0xB198
 +#define PCI_DEVICE_ID_VIA_C409_IDE    0XC409
 +#define PCI_DEVICE_ID_VIA_ANON                0xFFFF
  
  #define PCI_VENDOR_ID_SIEMENS           0x110A
  #define PCI_DEVICE_ID_SIEMENS_DSCC4     0x2102
@@@ -2425,6 -2421,7 +2425,7 @@@
  #define PCI_DEVICE_ID_INTEL_ICH7_0    0x27b8
  #define PCI_DEVICE_ID_INTEL_ICH7_1    0x27b9
  #define PCI_DEVICE_ID_INTEL_ICH7_30   0x27b0
+ #define PCI_DEVICE_ID_INTEL_TGP_LPC   0x27bc
  #define PCI_DEVICE_ID_INTEL_ICH7_31   0x27bd
  #define PCI_DEVICE_ID_INTEL_ICH7_17   0x27da
  #define PCI_DEVICE_ID_INTEL_ICH7_19   0x27dd