summaryrefslogtreecommitdiff
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-06-19 01:17:47 +0300
committerThomas Gleixner <tglx@linutronix.de>2015-06-19 01:17:47 +0300
commit624bbdfac99c50bf03dff9a0023f666b8e965627 (patch)
tree431d1345087021736a2ae66b041d2a9593ebf1d3 /tools/perf/scripts/python
parent6f9aad0bc37286c0441b57f0ba8cffee50715426 (diff)
parent887d9dc989eb0154492e41e7c07492edbb088ba1 (diff)
downloadlinux-624bbdfac99c50bf03dff9a0023f666b8e965627.tar.xz
Merge branch 'timers/core' into sched/hrtimers
Merge sched/core and timers/core so we can apply the sched balancing patch queue, which depends on both.
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions