From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jan 2012 23:02:37 +0000 (-0800)
Subject: Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=edf7c8148ec40c0fd27c0ef3f688defcc65e3913;p=~shefty%2Frdma-dev.git

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

* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: add IRQ context simulation in module mce-inject
  x86, mce, therm_throt: Don't report power limit and package level thermal throttle events in mcelog
  x86, MCE: Drain mcelog buffer
  x86, mce: Add wrappers for registering on the decode chain
---

edf7c8148ec40c0fd27c0ef3f688defcc65e3913