| commit | 767d2d710e9066c47919a4e5f05a21e1ad40ddc4 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Thu Oct 24 16:00:43 2019 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Thu Oct 24 16:00:43 2019 +0200 |
| tree | c020e45d7935478657bef73ccb0e6c434aea6d36 | |
| parent | 6941051d3028963c3b0b3fcdd0815f2b51b957bb [diff] | |
| parent | 31d851407f90076c58291fb5eadc82c1dd613cee [diff] | |
| parent | 028db79cf46ae860fbdc5aa4f431b6969ea72c7b [diff] |
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()