diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-06 14:52:10 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-06 14:52:10 +0100 |
| commit | cbf304e420da96992eae50bb6d51035681340ab8 (patch) | |
| tree | 76f729910e5fdca468464004f94b70b6b3cca81e /net/ipv4/tcp_metrics.c | |
| parent | d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c (diff) | |
| parent | a9306a63631493afc75893a4ac405d4e1cbae6aa (diff) | |
| parent | 6e978b22efa1db9f6e71b24440b5f1d93e968ee3 (diff) | |
Merge branches 'pm-core-fixes' and 'pm-cpufreq-fixes'
* pm-core-fixes:
PM / runtime: Avoid false-positive warnings from might_sleep_if()
* pm-cpufreq-fixes:
cpufreq: intel_pstate: Disable energy efficiency optimization
cpufreq: brcmstb-avs-cpufreq: properly retrieve P-state upon suspend
cpufreq: brcmstb-avs-cpufreq: extend sysfs entry brcm_avs_pmap