Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jun 2012 22:15:04 +0000 (15:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jun 2012 22:15:04 +0000 (15:15 -0700)
commiteea5b5510fc5545d15b69da8e485a7424ae388cf
tree472b0056777180045be743e90e340a5d3460e036
parentecc728467fb0c3e350b57fc66ed7585c15be50f5
parentc2238f10e0c34a85a2a555c8a197316d1ca3fb7e
Merge tag 'please-pull-mce' of git://git./linux/kernel/git/ras/ras

Pull MCE regression fix from Tony Luck:
 "Typo/thinko in a cleanup caused a semantic change. Fix it."

* tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  x86/mce: Fix the MCE poll timer logic
arch/x86/kernel/cpu/mcheck/mce.c