]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da45407 4f75d84)
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)
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>
1  2 
drivers/acpi/apei/einj.c patch | diff1 | diff2 | blob | history
drivers/acpi/apei/erst.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/apei/einj.c
Simple merge
diff --cc drivers/acpi/apei/erst.c
Simple merge
XArray, radix tree and IDR