]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 570b97f 0c0eb00 cdff09e)
Merge branches 'pm-cpuidle' and 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 13 Dec 2019 09:29:45 +0000 (10:29 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 13 Dec 2019 09:29:45 +0000 (10:29 +0100)
* 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


Trivial merge
Linux Kernel Source Tree.