Merge tag 'ras_for_3.14_p2' of git://git.kernel.org/pub/scm/linux/kernel/git/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 <[email protected]>

diff --cc drivers/acpi/apei/einj.c
Simple merge

diff --cc drivers/acpi/apei/erst.c
Simple merge