OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6941051
31d8514
028db79
)
Merge branches 'pm-cpuidle' and 'pm-opp'
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Thu, 24 Oct 2019 14:00:43 +0000
(16:00 +0200)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Thu, 24 Oct 2019 14:00:43 +0000
(16:00 +0200)
* 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()
Trivial merge