tree dde7448208538c616ad3ba25b41a816fccc015af
parent 82406da4a6998a0c98db0c5afb1695f97889bf79
parent a228b5892b0527b8574c06edc72cacaf8c25418d
author Linus Torvalds <torvalds@linux-foundation.org> 1325890957 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1325890957 -0800

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