Merge tag 'mce-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras...
authorIngo Molnar <mingo@elte.hu>
Wed, 14 Mar 2012 06:44:48 +0000 (07:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 14 Mar 2012 06:44:48 +0000 (07:44 +0100)
commitea281a9ebaba3287130dbe15bb0aad6f798bb06b
treecd365ac8eaa292df63ec183617c1f1c5128ebfca
parentcd593accdcc27ccbe6498d9ad1c2b6cc8e1d830d
parentfadd85f16a8ec3fee8af599e79a209682dc52348
Merge tag 'mce-for-tip' of git://git./linux/kernel/git/ras/ras into x86/mce

Apply two miscellaneous MCE fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/cpu/mcheck/mce_amd.c