From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 May 2012 18:01:52 +0000 (-0700)
Subject: Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.5-rc1~125
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=70311aaa8afb9790fb91886749cbf80e7e6cd8d0;p=~emulex%2Finfiniband.git

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

Pull MCE updates from Ingo Molnar:
 "This tree updates/fixes MCE hardware support, it makes the APIC LVT
  thresholding interrupt optional because a subset of AMD F15h models
  don't support it."

* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, MCE, AMD: Disable error thresholding bank 4 on some models
  x86, MCE, AMD: Hide interrupt_enable sysfs node
  x86, MCE, AMD: Make APIC LVT thresholding interrupt optional
---

70311aaa8afb9790fb91886749cbf80e7e6cd8d0