Merge branch 'perf/hw-branch-sampling' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 12 Mar 2012 19:46:35 +0000 (20:46 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 12 Mar 2012 19:47:05 +0000 (20:47 +0100)
commitbea95c152dee1791dd02cbc708afbb115bb00f9a
treeaf9994c42c5fdd81ba3dadd7b812e2fa85273353
parentf9b4eeb809c6d031cc9561cc34dd691701cb2c2a
parent24bff2dc0f77b1f186b7bdf30060caf3df191a68
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>
arch/arm/kernel/perf_event.c
arch/x86/kernel/cpu/perf_event.h
arch/x86/kernel/cpu/perf_event_intel.c