From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 May 2012 16:42:20 +0000 (-0700)
Subject: Merge tag 'linus-mce-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
X-Git-Url: http://git.alex.org.uk

Merge tag 'linus-mce-fix' of git://git./linux/kernel/git/ras/ras

Pull a machine check recovery fix from Tony Luck.

I really don't like how the MCE code does some of the things it does,
but this does seem to be an improvement.

* tag 'linus-mce-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  x86/mce: Only restart instruction after machine check recovery if it is safe
---

3d9944978e0bb6c98b901949cb7a22256e48b23d