Linus Torvalds 8cbd0eefca Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux ... Pull thermal management updates from Zhang Rui: "There are not too many changes this time, except two new platform thermal drivers, ti-soc-thermal driver and x86_pkg_temp_thermal driver, and a couple of small fixes. Highlights: - move the ti-soc-thermal driver out of the staging tree to the thermal tree. - introduce the x86_pkg_temp_thermal driver. This driver registers CPU digital temperature package level sensor as a thermal zone. - small fixes/cleanups including removing redundant use of platform_set_drvdata() and of_match_ptr for all platform thermal drivers" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (34 commits) thermal: cpu_cooling: fix stub function thermal: ti-soc-thermal: use standard GPIO DT bindings thermal: MAINTAINERS: Add git tree path for SoC specific updates thermal: fix x86_pkg_temp_thermal.c build and Kconfig Thermal: Documentation for x86 package temperature thermal driver Thermal: CPU Package temperature thermal thermal: consider emul_temperature while computing trend thermal: ti-soc-thermal: add DT example for DRA752 chip thermal: ti-soc-thermal: add dra752 chip to device table thermal: ti-soc-thermal: add thermal data for DRA752 chips thermal: ti-soc-thermal: remove usage of IS_ERR_OR_NULL thermal: ti-soc-thermal: freeze FSM while computing trend thermal: ti-soc-thermal: remove external heat while extrapolating hotspot thermal: ti-soc-thermal: update DT reference for OMAP5430 x86, mcheck, therm_throt: Process package thresholds thermal: cpu_cooling: fix 'descend' check in get_property() Thermal: spear: Remove redundant use of of_match_ptr Thermal: kirkwood: Remove redundant use of of_match_ptr Thermal: dove: Remove redundant use of of_match_ptr Thermal: armada: Remove redundant use of of_match_ptr ...		2013-07-11 12:26:08 -07:00
..
cpu-cooling-api.txt	thermal: add generic cpufreq cooling implementation	2012-09-24 14:44:38 +08:00
exynos_thermal	hwmon: exynos4: move thermal sensor driver to driver/thermal directory	2012-09-24 14:44:38 +08:00
exynos_thermal_emulation	doc: fix misspellings with 'codespell' tool	2013-05-28 12:02:12 +02:00
intel_powerclamp.txt	PM: Introduce Intel PowerClamp Driver	2013-02-06 13:45:00 +08:00
nouveau_thermal	drm/nouveau/hwmon: s/fan0/fan1/	2013-02-20 16:00:25 +10:00
sysfs-api.txt	Thermal: update documentation for thermal_zone_device_register	2013-04-27 09:16:04 +08:00
x86_pkg_temperature_thermal	Thermal: Documentation for x86 package temperature thermal driver	2013-06-18 06:27:57 +08:00