diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2013-07-19 09:34:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-19 09:34:42 +0200 |
| commit | e43fff2b98b4e99b189c086a9cf740b19eaf3538 (patch) | |
| tree | 658a5f73d5806fe47856547b17cbd23592856c62 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | perf: Remove the 'match' callback for auxiliary events processing (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | wireguard-linux-e43fff2b98b4e99b189c086a9cf740b19eaf3538.tar.xz wireguard-linux-e43fff2b98b4e99b189c086a9cf740b19eaf3538.zip | |
Merge branch 'linus' into perf/core
Merge in a v3.11-rc1-ish branch to go from v3.10 based development
to a v3.11 based one.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions