summaryrefslogtreecommitdiff
path: root/include/linux/preempt.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-03-12 23:46:35 +0400
committerIngo Molnar <mingo@elte.hu>2012-03-12 23:47:05 +0400
commitbea95c152dee1791dd02cbc708afbb115bb00f9a (patch)
treeaf9994c42c5fdd81ba3dadd7b812e2fa85273353 /include/linux/preempt.h
parentf9b4eeb809c6d031cc9561cc34dd691701cb2c2a (diff)
parent24bff2dc0f77b1f186b7bdf30060caf3df191a68 (diff)
downloadlinux-bea95c152dee1791dd02cbc708afbb115bb00f9a.tar.xz
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>
Diffstat (limited to 'include/linux/preempt.h')
0 files changed, 0 insertions, 0 deletions