From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 24 Oct 2019 14:00:43 +0000 (+0200)
Subject: Merge branches 'pm-cpuidle' and 'pm-opp'
X-Git-Tag: v5.4-rc5~28^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=767d2d710e9066c47919a4e5f05a21e1ad40ddc4;p=linux-block.git

Merge branches 'pm-cpuidle' and 'pm-opp'

* pm-cpuidle:
  cpuidle: haltpoll: Take 'idle=' override into account

* pm-opp:
  opp: Reinitialize the list_kref before adding the static OPPs again
  opp: core: Revert "add regulators enable and disable"
  opp: of: drop incorrect lockdep_assert_held()
---

767d2d710e9066c47919a4e5f05a21e1ad40ddc4