diff options
| author | Rafael J. Wysocki <[email protected]> | 2017-11-13 00:34:14 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2017-11-13 00:34:14 +0000 |
| commit | 622ade3a2ff0fc4c026f116ea6018eddaeb49925 (patch) | |
| tree | 44d62d3929632a0f1a802decc6b1f1f680ce658f /lib/mpi/mpi-cmp.c | |
| parent | Merge branch 'pm-qos' (diff) | |
| parent | intel_idle: Graceful probe failure when MWAIT is disabled (diff) | |
| download | kernel-622ade3a2ff0fc4c026f116ea6018eddaeb49925.tar.gz kernel-622ade3a2ff0fc4c026f116ea6018eddaeb49925.zip | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
intel_idle: Graceful probe failure when MWAIT is disabled
cpuidle: Avoid assignment in if () argument
cpuidle: Clean up cpuidle_enable_device() error handling a bit
cpuidle: ladder: Add per CPU PM QoS resume latency support
ARM: cpuidle: Refactor rollback operations if init fails
ARM: cpuidle: Correct driver unregistration if init fails
intel_idle: replace conditionals with static_cpu_has(X86_FEATURE_ARAT)
cpuidle: fix broadcast control when broadcast can not be entered
Conflicts:
drivers/idle/intel_idle.c
Diffstat (limited to 'lib/mpi/mpi-cmp.c')
0 files changed, 0 insertions, 0 deletions