summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-02 16:30:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-02 16:30:46 -0700
commit3045f94a20cc54e3e5b20a843701eeab86f57163 (patch)
tree3f5e4fd6ed396f73ce2120a22ce93df94163fadb /include/trace
parent52e8ad9066b57510e600acc4bbc4455a81732c6c (diff)
parentfb476cffd5e345434c03f3c0e82a7e8d87f98ab0 (diff)
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 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
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions