Merge branch 'perf/hw-branch-sampling' into perf/core

Merge reason: The 'perf record -b' hardware branch sampling feature is ready for upstream.

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

diff --cc arch/arm/kernel/perf_event.c
Simple merge

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

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