From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 13 Dec 2019 09:29:45 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle' and 'acpi-pm'
X-Git-Tag: baikal/mips/sdk5.9~14710^2
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=d857f50d1bdb710dfb39cc820d7ef1f882c57f17;p=kernel.git

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
---

d857f50d1bdb710dfb39cc820d7ef1f882c57f17