tree 0e0441eca766616fccd8fc37a3885397efc6063a
parent 35cb8d9e18c0bb33b90d7e574abadbe23b65427d
parent ea281a9ebaba3287130dbe15bb0aad6f798bb06b
author Linus Torvalds <torvalds@linux-foundation.org> 1332434524 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1332434524 -0700

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

Pull MCE changes from Ingo Molnar.

* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Fix return value of mce_chrdev_read() when erst is disabled
  x86/mce: Convert static array of pointers to per-cpu variables
  x86/mce: Replace hard coded hex constants with symbolic defines
  x86/mce: Recognise machine check bank signature for data path error
  x86/mce: Handle "action required" errors
  x86/mce: Add mechanism to safely save information in MCE handler
  x86/mce: Create helper function to save addr/misc when needed
  HWPOISON: Add code to handle "action required" errors.
  HWPOISON: Clean up memory_failure() vs. __memory_failure()