Merge tag 'ras_for_3.14_p2' of git://git.kernel.org/pub/scm/linux/kernel/git/ras...
authorIngo Molnar <mingo@kernel.org>
Sun, 12 Jan 2014 16:56:54 +0000 (17:56 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 12 Jan 2014 16:56:54 +0000 (17:56 +0100)
commitb769e014f3ae4af8a56c6327077b3c40410dedad
treebeeaa315d7287b96f2813d8d060c43f2658a07b8
parentda4540757d35a98a350d6e8d882a64b2d04f8581
parent4f75d8412792777a314ac5c1393a9ed43d695fd1
Merge tag 'ras_for_3.14_p2' of git://git./linux/kernel/git/ras/ras into x86/ras

Pull RAS updates from Borislav Petkov:

 " SCI reporting for other error types not only correctable ones
   + APEI GHES cleanups
   + mce timer fix
 "

Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/acpi/apei/einj.c
drivers/acpi/apei/erst.c