From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Jun 2012 22:15:04 +0000 (-0700)
Subject: Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
X-Git-Tag: Ubuntu-5.0.0-8.9~15881
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=eea5b5510fc5545d15b69da8e485a7424ae388cf;p=mirror_ubuntu-disco-kernel.git

Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/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
---

eea5b5510fc5545d15b69da8e485a7424ae388cf