]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Nov 2017 00:34:14 +0000 (01:34 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Nov 2017 00:34:14 +0000 (01:34 +0100)
commit88cc560038c6731d502d9e0aa3ce5e75961c2bf0
tree44d62d3929632a0f1a802decc6b1f1f680ce658f
parent1c462ba02d5e0509d0145626bfa7a6c0ea042154
parentfea1c0c1d5b1a7b1246b07c545e3ab3ce86779d7
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
drivers/idle/intel_idle.c