diff options
author | 2011-02-07 08:44:11 +0100 | |
---|---|---|
committer | 2011-02-07 08:44:26 +0100 | |
commit | c7f9a6f377fa64e5a74f8c128d4349765c28fab1 (patch) | |
tree | e71eaf08c5f9179d6fd6c7e08d8539358dc76ad1 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | perf: Cure task_oncpu_function_call() races (diff) | |
parent | Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 (diff) | |
download | wireguard-linux-c7f9a6f377fa64e5a74f8c128d4349765c28fab1.tar.xz wireguard-linux-c7f9a6f377fa64e5a74f8c128d4349765c28fab1.zip |
Merge branch 'linus' into perf/core
Merge reason: Pick up perf fixes that are now upstream
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