diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-15 19:20:26 +1300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-15 19:20:26 +1300 |
| commit | f800c25b7a762d445ba1439a2428c8362157eba6 (patch) | |
| tree | 114f92970cc1701914b7fa1d70c597fa5661c811 /MAINTAINERS | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc (diff) | |
| download | linux-dev-f800c25b7a762d445ba1439a2428c8362157eba6.tar.xz linux-dev-f800c25b7a762d445ba1439a2428c8362157eba6.zip | |
Merge branch 'thermal-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal fixes from Zhang Rui:
"Specifics:
- bogus type qualifier fix in OF thermal code.
- Minor fixes on imx and rcar thermal drivers.
- Update TI SoC thermal maintainer entry.
- Updated documentation of OF cpufreq cooling register"
* 'thermal-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: rcar: Spelling/grammar: s/drier use .../driver uses ...s/
thermal: rcar: change type of ctemp in rcar_thermal_update_temp()
thermal: rcar: fix ENR register value
Documentation: thermal: document of_cpufreq_cooling_register()
Thermal: imx: add clk disable/enable for suspend/resume
MAINTAINERS: update ti-soc-thermal status
MAINTAINERS: Add linux-omap to list of reviewers for TI Thermal
thermal: of: Remove bogus type qualifier for of_thermal_get_trip_points()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 600d2aad8276..ab6610e6c610 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9543,7 +9543,8 @@ F: drivers/platform/x86/thinkpad_acpi.c TI BANDGAP AND THERMAL DRIVER M: Eduardo Valentin <edubezval@gmail.com> L: linux-pm@vger.kernel.org -S: Supported +L: linux-omap@vger.kernel.org +S: Maintained F: drivers/thermal/ti-soc-thermal/ TI CLOCK DRIVER |