diff options
| author | Linus Torvalds | 2019-07-17 13:13:41 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-17 13:13:41 -0700 |
| commit | aac09ce27556f79f20a860ae89d790d7bfbf1747 (patch) | |
| tree | 205fa380d16ac1edfb5a971873f2e85e8d922b17 /MAINTAINERS | |
| parent | c3c08f939abe3a1c95338a246c550aca0989dade (diff) | |
| parent | 6c395f66e98c895cf3ebf87c0b2fc63b6a57a196 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management updates from Zhang Rui:
- Convert thermal documents to ReST (Mauro Carvalho Chehab)
- Fix a cyclic depedency in between thermal core and governors (Daniel
Lezcano)
- Fix processor_thermal_device driver to re-evaluate power limits after
resume (Srinivas Pandruvada, Zhang Rui)
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
drivers: thermal: processor_thermal_device: Fix build warning
docs: thermal: convert to ReST
thermal/drivers/core: Use governor table to initialize
thermal/drivers/core: Add init section table for self-encapsulation
drivers: thermal: processor_thermal: Read PPCC on resume
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2c149887ae39..ce0687771073 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15896,7 +15896,7 @@ M: Viresh Kumar <viresh.kumar@linaro.org> M: Javi Merino <javi.merino@kernel.org> L: linux-pm@vger.kernel.org S: Supported -F: Documentation/thermal/cpu-cooling-api.txt +F: Documentation/thermal/cpu-cooling-api.rst F: drivers/thermal/cpu_cooling.c F: include/linux/cpu_cooling.h |