diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-22 10:37:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-22 10:37:06 +0200 |
| commit | ec6e7f4082aa0c6c4334149e74673b6ed736fb63 (patch) | |
| tree | 0facf7775816261ffeeb9bb61468f9075d63cfb6 /tools/perf/scripts/python | |
| parent | Merge tag 'v3.15-rc6' into sched/core, to pick up the latest fixes (diff) | |
| parent | PM / suspend: Always use deepest C-state in the "freeze" sleep state (diff) | |
| download | linux-ec6e7f4082aa0c6c4334149e74673b6ed736fb63.tar.gz linux-ec6e7f4082aa0c6c4334149e74673b6ed736fb63.zip | |
Merge branch 'pm-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into sched/core
Pull scheduling related CPU idle updates from Rafael J. Wysocki.
Conflicts:
kernel/sched/idle.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions