Merge branch 'perf/hw-branch-sampling' into perf/core
Ingo Molnar [Mon, 12 Mar 2012 19:46:35 +0000 (20:46 +0100)]
Merge reason: The 'perf record -b' hardware branch sampling feature is ready for upstream.

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

1  2 
arch/arm/kernel/perf_event.c
arch/x86/kernel/cpu/perf_event.h
arch/x86/kernel/cpu/perf_event_intel.c

Simple merge
Simple merge