aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-10-24 16:00:43 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-10-24 16:00:43 +0200
commit767d2d710e9066c47919a4e5f05a21e1ad40ddc4 (patch)
treec020e45d7935478657bef73ccb0e6c434aea6d36 /drivers
parentcpufreq: Cancel policy update work scheduled before freeing (diff)
parentcpuidle: haltpoll: Take 'idle=' override into account (diff)
parentMerge branch 'opp/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm (diff)
downloadlinux-dev-767d2d710e9066c47919a4e5f05a21e1ad40ddc4.tar.xz
linux-dev-767d2d710e9066c47919a4e5f05a21e1ad40ddc4.zip
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()