diff options
author | 2015-12-18 09:43:24 +0100 | |
---|---|---|
committer | 2015-12-18 09:43:24 +0100 | |
commit | 141a361e1dbafb91ac600e6a08c53ebcf84e1a9e (patch) | |
tree | cdc7fe583ee8d4837a1bc2246d861a69828edbce /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge tag 'perf-core-for-mingo-2.1' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff) | |
parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff) | |
download | linux-dev-141a361e1dbafb91ac600e6a08c53ebcf84e1a9e.tar.xz linux-dev-141a361e1dbafb91ac600e6a08c53ebcf84e1a9e.zip |
Merge branch 'perf/urgent' into perf/core, to make sure a cherry-picked commit does not create conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions