diff options
author | 2012-02-28 19:59:45 +0100 | |
---|---|---|
committer | 2012-02-28 19:59:47 +0100 | |
commit | a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5 (patch) | |
tree | 9fcffea752514702a78a8f6177d995964761559d /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core (diff) | |
parent | static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]() (diff) | |
download | wireguard-linux-a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5.tar.xz wireguard-linux-a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5.zip |
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>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions