Merge tag 'mce-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras...

author Ingo Molnar <mingo@elte.hu>

Wed, 14 Mar 2012 06:44:48 +0000 (07:44 +0100)

committer Ingo Molnar <mingo@elte.hu>

Wed, 14 Mar 2012 06:44:48 +0000 (07:44 +0100)
author Ingo Molnar <mingo@elte.hu>
Wed, 14 Mar 2012 06:44:48 +0000 (07:44 +0100)
committer Ingo Molnar <mingo@elte.hu>
Wed, 14 Mar 2012 06:44:48 +0000 (07:44 +0100)
diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge
diff --cc arch/x86/kernel/cpu/mcheck/mce_amd.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 14 Mar 2012 06:44:48 +0000 (07:44 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 14 Mar 2012 06:44:48 +0000 (07:44 +0100)
		1	2
arch/x86/kernel/cpu/mcheck/mce.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce_amd.c	patch \|	diff1 \|	diff2 \|	blob \| history