Merge branches 'x86/mce' and 'x86/urgent' into perf/mce
authorIngo Molnar <mingo@elte.hu>
Fri, 16 Oct 2009 12:42:20 +0000 (14:42 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 16 Oct 2009 12:42:25 +0000 (14:42 +0200)
commit6b50f5c7c7163d50af0946a93b61c05e448f6038
tree9ad2149b75699042d247952ab443de9c6a2a842f
parent8968f9d3dc23d9a1821d97c6f11e72a59382e56c
parentfb2531953fd8855abdcf458459020fd382c5deca
parent93ae5012a79b11e7fc855b52c7ce1e16fe1540b0
Merge branches 'x86/mce' and 'x86/urgent' into perf/mce

Merge reason: Put all MCE changes into this branch, we are
              queueing up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/mcheck/mce.c
tools/perf/Makefile
tools/perf/builtin-sched.c
tools/perf/util/trace-event-parse.c