summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-13 01:34:14 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-13 01:34:14 +0100
commit622ade3a2ff0fc4c026f116ea6018eddaeb49925 (patch)
tree44d62d3929632a0f1a802decc6b1f1f680ce658f /arch
parent4762573b934cced83b91950f0e7a9f160e3983e3 (diff)
parenta4c447533a18ee86e07232d6344ba12b1f9c5077 (diff)
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 'arch')
0 files changed, 0 insertions, 0 deletions