From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Feb 2015 02:22:04 +0000 (-0800)
Subject: Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Tag: v4.0-rc1~153
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e07e0d4cb0c4bfe822ec8491cc06269096a38bea;p=linux.git

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

Pull x86 RAS update from Ingo Molnar:
 "The changes in this cycle were:

   - allow mmcfg access to APEI error injection handlers

   - improve MCE error messages

   - smaller cleanups"

* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, mce: Fix sparse errors
  x86, mce: Improve timeout error messages
  ACPI, EINJ: Enhance error injection tolerance level
---

e07e0d4cb0c4bfe822ec8491cc06269096a38bea