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

Browse source

* 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()

...

This commit is contained in:

Rafael J. Wysocki 2019-10-24 16:00:43 +02:00

parent 6941051d30 31d851407f 028db79cf4

commit 767d2d710e

3 changed files with 14 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/cpuidle/cpuidle-haltpoll.c

View file

16

drivers/opp/core.c

View file

9

drivers/opp/of.c

View file