]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'x86/mce' into x86/ras
authorIngo Molnar <mingo@kernel.org>
Mon, 12 Aug 2013 15:54:05 +0000 (17:54 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 12 Aug 2013 15:54:05 +0000 (17:54 +0200)
commit0237d7f355eef4d9ab8557e1597e8c9debd6c8c2
tree753837a9fb9e3f65bc7450994159683a47f086a6
parentbf6c216282a260d3ce727c23fc15f28a76beff0b
parentcf870c70a194443f8fc654ddc9d6cfd02c58003b
Merge branch 'x86/mce' into x86/ras

Pursue a single RAS/MCE topic branch on x86.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/acpi.h
arch/x86/include/asm/mce.h
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/cpu/mcheck/mce_intel.c
drivers/acpi/apei/ghes.c
include/linux/mm.h
mm/memory-failure.c