diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-23 10:58:22 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-23 10:58:22 +0400 |
| commit | 90338325a9cab8ff93359963e3a37be1c8907389 (patch) | |
| tree | 58d7473cea8eec2300549df1a4e9bb25f2298377 /arch | |
| parent | ea89e1d320ebde318ae0217fec625102b9165774 (diff) | |
| parent | 167c3ad268c2643b926d693f402e893ce64857a8 (diff) | |
| download | linux-90338325a9cab8ff93359963e3a37be1c8907389.tar.xz | |
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fixes from Zhang Rui:
"These includes several commits that are necessary to properly fix
regression for TMU test MUX address setting after reset, for exynos
thermal driver.
Specifics:
- fix a regression that the removal of setting a certain field at TMU
configuration setting results in immediately shutdown after reset
on Exynos4412 SoC.
- revert a patch which tries to link the thermal_zone device and its
hwmon node but breaks libsensors.
- fix a deadlock/lockdep warning issue in x86_pkg_temp thermal
driver, which can be reproduced on a buggy platform only.
- fix ti-soc-thermal driver to fall back on bandgap reading when
reading from PCB temperature sensor fails"
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
Revert "drivers: thermal: parent virtual hwmon with thermal zone"
drivers: thermal: allow ti-soc-thermal run without pcb zone
thermal: exynos: Provide initial setting for TMU's test MUX address at Exynos4412
thermal: exynos: Provide separate TMU data for Exynos4412
thermal: exynos: Remove check for thermal device pointer at exynos_report_trigger()
Thermal: x86_pkg_temp: change spin lock
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions