From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Aug 2010 23:24:51 +0000 (-0700)
Subject: Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.36-rc1~508
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e8779776afbd5f2d5315cf48c4257ca7e9b250fb;p=~emulex%2Finfiniband.git

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

* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mce: Use HW_ERR in MCE handler
  x86, mce: Add HW_ERR printk prefix for hardware error logging
  x86, mce: Fix MSR_IA32_MCI_CTL2 CMCI threshold setup
  x86, mce: Rename MSR_IA32_MCx_CTL2 value
---

e8779776afbd5f2d5315cf48c4257ca7e9b250fb