From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Jul 2013 23:30:46 +0000 (-0700)
Subject: Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~5818
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3045f94a20cc54e3e5b20a843701eeab86f57163;p=firefly-linux-kernel-4.4.55.git

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

Pull x86 RAS update from Ingo Molnar:
 "The changes in this tree are:

   - ACPI APEI (ACPI Platform Error Interface) improvements, by Chen
     Gong
   - misc MCE fixes/cleanups"

* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Update MCE severity condition check
  mce: acpi/apei: Add comments to clarify usage of the various bitfields in the MCA subsystem
  ACPI/APEI: Update einj documentation for param1/param2
  ACPI/APEI: Add parameter check before error injection
  ACPI, APEI, EINJ: Fix error return code in einj_init()
  x86, mce: Fix "braodcast" typo
---

3045f94a20cc54e3e5b20a843701eeab86f57163