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

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)
  PCI: Don't use dmi_name_in_vendors in quirk
  PCI: remove unused AER functions
  PCI/sysfs: move bus cpuaffinity to class dev_attrs
  PCI: add rescan to /sys/.../pci_bus/.../
  PCI: update bridge resources to get more big ranges when allocating space (again)
  KVM: Use pci_store/load_saved_state() around VM device usage
  PCI: Add interfaces to store and load the device saved state
  PCI: Track the size of each saved capability data area
  PCI/e1000e: Add and use pci_disable_link_state_locked()
  x86/PCI: derive pcibios_last_bus from ACPI MCFG
  PCI: add latency tolerance reporting enable/disable support
  PCI: add OBFF enable/disable support
  PCI: add ID-based ordering enable/disable support
  PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.
  PCI: Set PCIE maxpayload for card during hotplug insertion
  PCI/ACPI: Report _OSC control mask returned on failure to get control
  x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs
  PCI: handle positive error codes
  PCI: check pci_vpd_pci22_wait() return
  PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio
  ...

Fix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be4461
moved the intel SMBUS ID definitons to the i2c-i801.c driver.

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc drivers/i2c/busses/i2c-i801.c
index 455e909bc768637a1a7f6d793f626baef082f46d,72c0415f6f944922470ad962361c086ac4290809..ec36208c9977a7dca0201dad5fcd21b6b922d163
--- 1/drivers/i2c/busses/i2c-i801.c
--- 2/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@@ -134,9 -134,6 +134,10 @@@
                                 SMBHSTSTS_BUS_ERR | SMBHSTSTS_DEV_ERR | \
                                 SMBHSTSTS_INTR)
  
 +/* Older devices have their ID defined in <linux/pci_ids.h> */
 +#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS 0x1c22
 +#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS    0x1d22
++#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS        0x1e22
  /* Patsburg also has three 'Integrated Device Function' SMBus controllers */
  #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0       0x1d70
  #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1       0x1d71

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc drivers/pci/pci.h
Simple merge

diff --cc drivers/pci/setup-bus.c
Simple merge

diff --cc include/linux/kvm_host.h
Simple merge

diff --cc include/linux/pci_ids.h
index 8652a4fa3fe2802ebc4d6e5fb1bbf8ed6a98399f,52f4ed4de490d6a5d63bc1b5170d95eb00f8205b..24787b751286ef4d7f69b08f9a4e8791d1f3e9c3
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -2479,12 -2477,18 +2479,14 @@@
  #define PCI_DEVICE_ID_INTEL_82840_HB  0x1a21
  #define PCI_DEVICE_ID_INTEL_82845_HB  0x1a30
  #define PCI_DEVICE_ID_INTEL_IOAT      0x1a38
 -#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS 0x1c22
  #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN       0x1c41
  #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX       0x1c5f
 -#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS        0x1e22
 -#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN      0x1e40
 -#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX      0x1e5f
 -#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS    0x1d22
  #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0    0x1d40
  #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1    0x1d41
++#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN      0x1e40
++#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX      0x1e5f
  #define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN  0x2310
  #define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX  0x231f
 -#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS    0x2330
  #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
  #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411
  #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413