]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/jump-labels' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 28 Feb 2012 18:59:45 +0000 (19:59 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 28 Feb 2012 18:59:47 +0000 (19:59 +0100)
commitc3d07671fc5c9cff2cedc60fb1749cf00c090e3d
tree9fcffea752514702a78a8f6177d995964761559d
parent36523158b98d730a271d2e35505a27b0c2ce7de1
parent9aa2b6019ddadbb91917771b43a774042986567c
Merge branch 'perf/jump-labels' into perf/core

Merge reason: After much naming discussion, there seems to be consensus
              now - queue it up for v3.4.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/perf_event.h