Merge tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull edac updates from Mauro Carvalho Chehab:
 "Nothing really exiting here: just one bug fix at sb_edac, and some
  changes to allow other drivers to use some shared PCI addresses"

* tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
  sb_edac: Claim a different PCI device
  Move Intel SNB device ids from sb_edac to pci_ids.h
  sb_edac: avoid INTERNAL ERROR message in EDAC with unspecified channel

diff --combined include/linux/pci_ids.h
index da9e6f75319643e1e68d8da05eb9ee574fcc76af,58aa8d78353f9d383a536b312598706012dd7191..2338e68398cb5d70fb7aa4d04e86119e2d6da609
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -2245,8 -2245,6 +2245,8 @@@
  #define PCI_VENDOR_ID_MORETON         0x15aa
  #define PCI_DEVICE_ID_RASTEL_2PORT    0x2000
  
 +#define PCI_VENDOR_ID_VMWARE          0x15ad
 +
  #define PCI_VENDOR_ID_ZOLTRIX         0x15b0
  #define PCI_DEVICE_ID_ZOLTRIX_2BD0    0x2bd0
  
@@@ -2820,7 -2818,22 +2820,22 @@@
  #define PCI_DEVICE_ID_INTEL_UNC_R2PCIE        0x3c43
  #define PCI_DEVICE_ID_INTEL_UNC_R3QPI0        0x3c44
  #define PCI_DEVICE_ID_INTEL_UNC_R3QPI1        0x3c45
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS   0x3c71  /* 15.1 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR0  0x3c72  /* 16.2 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR1  0x3c73  /* 16.3 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR2  0x3c76  /* 16.6 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR3  0x3c77  /* 16.7 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0   0x3ca0  /* 14.0 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA    0x3ca8  /* 15.0 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD0  0x3caa  /* 15.2 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1  0x3cab  /* 15.3 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2  0x3cac  /* 15.4 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3  0x3cad  /* 15.5 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO 0x3cb8  /* 17.0 */
  #define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX     0x3ce0
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0      0x3cf4  /* 12.6 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_BR                0x3cf5  /* 13.6 */
+ #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1      0x3cf6  /* 12.7 */
  #define PCI_DEVICE_ID_INTEL_IOAT_SNB  0x402f
  #define PCI_DEVICE_ID_INTEL_5100_16   0x65f0
  #define PCI_DEVICE_ID_INTEL_5100_19   0x65f3