From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 13 Oct 2020 12:39:52 +0000 (+0200)
Subject: Merge branches 'pm-cpuidle' and 'pm-devfreq'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fe5975b1b8b21e2a17ac80592099b9aa6efb5899;p=linux.git

Merge branches 'pm-cpuidle' and 'pm-devfreq'

* pm-cpuidle:
  cpuidle: record state entry rejection statistics
  cpuidle: psci: Allow PM domain to be initialized even if no OSI mode
  firmware: psci: Extend psci_set_osi_mode() to allow reset to PC mode
  ACPI: processor: Print more information when acpi_processor_evaluate_cst() fails
  cpuidle: tegra: Correctly handle result of arm_cpuidle_simple_enter()

* pm-devfreq:
  PM / devfreq: tegra30: Improve initial hardware resetting
  PM / devfreq: event: Change prototype of devfreq_event_get_edev_by_phandle function
  PM / devfreq: Change prototype of devfreq_get_devfreq_by_phandle function
  PM / devfreq: Add devfreq_get_devfreq_by_node function
---

fe5975b1b8b21e2a17ac80592099b9aa6efb5899