From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Apr 2013 15:42:45 +0000 (-0700)
Subject: Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'x86-ras-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 RAS changes from Ingo Molnar:

 - Add an Intel CMCI hotplug fix

 - Add AMD family 16h EDAC support

 - Make the AMD MCE banks code more flexible for virtual environments

* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  amd64_edac: Add Family 16h support
  x86/mce: Rework cmci_rediscover() to play well with CPU hotplug
  x86, MCE, AMD: Use MCG_CAP MSR to find out number of banks on AMD
  x86, MCE, AMD: Replace shared_bank array with is_shared_bank() helper
---

5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e
diff --cc arch/x86/kernel/amd_nb.c
index 3684129be947,f1d0a1446d3a..3048ded1b598
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@@ -24,8 -25,9 +25,9 @@@ const struct pci_device_id amd_nb_misc_
  };
  EXPORT_SYMBOL(amd_nb_misc_ids);
  
 -static struct pci_device_id amd_nb_link_ids[] = {
 +static const struct pci_device_id amd_nb_link_ids[] = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
  	{}
  };