diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-13 10:29:45 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-13 10:29:45 +0100 |
| commit | 4c84515da8099f4bab5d9312a0ffaf40f14aa87b (patch) | |
| tree | 1202f6599a527610e359bf6106377e18ddacde84 /drivers | |
| parent | e8ad8d5108e0304532fc800433714ed664ecf71d (diff) | |
| parent | d4d8140176972fdb3f00bffc88e63af781de8d67 (diff) | |
| parent | b9ea0bae260f6aae546db224daa6ac1bd9d94b91 (diff) | |
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