Merge branch 'perf/mce' into perf/core
Ingo Molnar [Thu, 3 Dec 2009 19:10:59 +0000 (20:10 +0100)]
Merge reason: It's ready for v2.6.33.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
arch/x86/kernel/setup.c

Simple merge