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)
commita706d4fc9e56d8e46393533e0cdca2d35fa5c7e5
tree9fcffea752514702a78a8f6177d995964761559d
parent83b8450317a1441aef5d110cbc4102d53df9ec02
parentc5905afb0ee6550b42c49213da1c22d67316c194
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