diff options
author | 2011-08-05 10:32:54 +0200 | |
---|---|---|
committer | 2011-08-05 10:33:55 +0200 | |
commit | 3272cab4063467410802367a8d69f06c65b2a866 (patch) | |
tree | 1c665f8572b0aab2a5343d32b5eaa6713669b04f /tools/perf/scripts/python/syscall-counts.py | |
parent | trace events: Update version number reference to new 3.x scheme for EVENT_POWER_TRACING_DEPRECATED (diff) | |
parent | Do 'shm_init_ns()' in an early pure_initcall (diff) | |
download | linux-dev-3272cab4063467410802367a8d69f06c65b2a866.tar.xz linux-dev-3272cab4063467410802367a8d69f06c65b2a866.zip |
Merge branch 'linus' into perf/urgent
Merge reason: Include most of the merge window trees, to do fixes on top.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions