summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-06-01 15:20:45 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-06-01 15:20:45 +0200
commita34024d98eeaa78e2cd22017180df778800b83fc (patch)
treec8de2d6e430d030be7f5c312961f99c1c2939cb5 /fs
parentac7ccfc75faf2d82fe3176a100ed032621335b62 (diff)
parent86954c98fc3092cb6679ffcf108761b94ecdff34 (diff)
parent03c3b413a14d8bbf0afc8e069cf2a65df580c30c (diff)
parent213081dadd308d5d41a5110c2dc87fd8ba42de5e (diff)
parent5ed909b368fcf118ce208a6c03826d4e70e482ae (diff)
downloadlinux-a34024d98eeaa78e2cd22017180df778800b83fc.tar.bz2
Merge branches 'pm-devfreq', 'powercap', 'pm-docs' and 'pm-tools'
* pm-devfreq: PM / devfreq: Use lockdep asserts instead of manual checks for locked mutex PM / devfreq: imx-bus: Fix inconsistent IS_ERR and PTR_ERR PM / devfreq: Replace strncpy with strscpy PM / devfreq: imx: Register interconnect device PM / devfreq: Add generic imx bus scaling driver PM / devfreq: tegra30: Delete an error message in tegra_devfreq_probe() PM / devfreq: tegra30: Make CPUFreq notifier to take into account boosting * powercap: powercap: RAPL: remove unused local MSR define powercap/intel_rapl: add support for ElkhartLake * pm-docs: Documentation: admin-guide: pm: Document intel-speed-select * pm-tools: cpupower: Remove unneeded semicolon