Merge tag 'mce-recovery-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Jan 2012 10:40:13 +0000 (11:40 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Jan 2012 10:40:13 +0000 (11:40 +0100)
commit4e9f44ba29f20484615a461244bfd3a419391490
tree490dd38bb8d14765327cee0be2f9731254e9c402
parent87f71ae2dd7471c1b4c94100be1f218e91dc64c3
parent5f7b88d51e89771f64c15903b96b5933dd0bc6d8
Merge tag 'mce-recovery-for-tip' of git://git./linux/kernel/git/ras/ras into x86/mce

Implement MCE recovery for the data load error path and assorted cleanups.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/mcheck/mce.c
drivers/base/memory.c
include/linux/mm.h
mm/memory-failure.c