Merge branch 'perf/mce' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 3 Dec 2009 19:10:59 +0000 (20:10 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 3 Dec 2009 19:11:06 +0000 (20:11 +0100)
commit26fb20d008d841268545c25bb183f21ed16db891
tree4e14dc653d0e6b5d43c2bb8f55b795b232200698
parent23ba90e328fd2326378447cafafa47defdfc83c2
parent767df1bdd8cbff2c8c40c9ac8295bbdaa5fb24c4
Merge branch 'perf/mce' into perf/core

Merge reason: It's ready for v2.6.33.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/setup.c