Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/events/intel/core.c
Simple merge

diff --cc arch/x86/kernel/kprobes/common.h
Simple merge

diff --cc arch/x86/kernel/kprobes/core.c
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc tools/perf/Documentation/perf-record.txt
Simple merge

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

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

diff --cc tools/perf/util/parse-events.l
Simple merge

diff --cc tools/perf/util/pmu.c
Simple merge

diff --cc tools/perf/util/pmu.h
Simple merge

diff --cc tools/perf/util/session.c
Simple merge