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>

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge

diff --cc tools/perf/Makefile
Simple merge

diff --cc tools/perf/builtin-sched.c
Simple merge

diff --cc tools/perf/util/trace-event-parse.c
Simple merge