]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5d3470e50b09bc8066250d9d43a51583898d865a
treeaf9994c42c5fdd81ba3dadd7b812e2fa85273353
parent21357796a085b71626fcc06ac2d4d22fd634893d
parent4a2d354ec650821591fcdaf9ebd396bd0b2f4e69
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