Merge branch 'perf/urgent' into perf/core

Merge reason: Pick up updates before queueing up dependent patches.

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

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

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

diff --cc include/linux/sched.h
Simple merge

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

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