From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 16 Dec 2013 13:33:17 +0000 (+0100)
Subject: Merge tag 'ras_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into... 
X-Git-Tag: v3.14-rc1~158^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=014952270eb9770a41084e74c721e4c07f2306c5;p=platform%2Fkernel%2Flinux-stable.git

Merge tag 'ras_for_3.14' of git://git./linux/kernel/git/bp/bp into x86/ras

Pull RAS updates from Borislav Petkov:

  * Add the functionality to override error reporting agents as some
  machines are sporting a new extended error logging capability which, if
  done properly in the BIOS, makes a corresponding EDAC module redundant,
  from Gong Chen.

  * PCIe AER tracepoint severity levels fix, from Rui Wang.

  * Error path correction for the mce device init, from Levente Kurusa.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

014952270eb9770a41084e74c721e4c07f2306c5