diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 03:40:52 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 03:40:52 +0300 |
| commit | 28da43956b04d2bd854d8db3ab1883a223bee07d (patch) | |
| tree | a1d7c9569859a18803ac3926583030dc34d45d26 /security/keys/keyctl.c | |
| parent | 60af981c78a72255355c8e374e173b550d6742d6 (diff) | |
| parent | 07458f6a5171d97511dfbdf6ce549ed2ca0280c7 (diff) | |
| parent | b6aa98364f842f943495408895627702ad7ad44b (diff) | |
| download | linux-28da43956b04d2bd854d8db3ab1883a223bee07d.tar.xz | |
Merge branches 'pm-cpufreq-sched' and 'pm-opp'
* pm-cpufreq-sched:
cpufreq: schedutil: Reset cached_raw_freq when not in sync with next_freq
* pm-opp:
PM / OPP: Add dev_pm_opp_{un}register_get_pstate_helper()
PM / OPP: Support updating performance state of device's power domain
PM / OPP: add missing of_node_put() for of_get_cpu_node()
PM / OPP: Rename dev_pm_opp_register_put_opp_helper()
PM / OPP: Add missing of_node_put(np)
PM / OPP: Move error message to debug level
PM / OPP: Use snprintf() to avoid kasprintf() and kfree()
PM / OPP: Move the OPP directory out of power/