aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-12-13 10:29:45 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-12-13 10:29:45 +0100
commit4c84515da8099f4bab5d9312a0ffaf40f14aa87b (patch)
tree1202f6599a527610e359bf6106377e18ddacde84
parente8ad8d5108e0304532fc800433714ed664ecf71d (diff)
parentd4d8140176972fdb3f00bffc88e63af781de8d67 (diff)
parentb9ea0bae260f6aae546db224daa6ac1bd9d94b91 (diff)
downloadlinux-stericsson-4c84515da8099f4bab5d9312a0ffaf40f14aa87b.tar.gz
Merge branches 'pm-cpuidle' and 'acpi-pm'
* pm-cpuidle: cpuidle: Drop unnecessary type cast in cpuidle_poll_time() cpuidle: Fix cpuidle_driver_state_disabled() cpuidle: use first valid target residency as poll time * acpi-pm: ACPI: PM: Avoid attaching ACPI PM domain to certain devices