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)
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>
1  2 
include/linux/perf_event.h

Simple merge