diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-22 12:36:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-22 12:36:47 -0800 |
| commit | bb6c01c2dde67b165cf7c808b0f00677b6f94b96 (patch) | |
| tree | 91187e97fc13f25a1aac4a60f333c76125dab0f6 /tools/virtio/ringtest/main.h | |
| parent | c497f8d17246720afe680ea1a8fa6e48e75af852 (diff) | |
| parent | bad94f8068122b6342a73a218dad7d41e6ea907b (diff) | |
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fixes from Zhang Rui:
- fix a regression that thermal zone dynamically allocated sysfs
attributes are freed before they're removed, which is introduced in
4.10-rc1 (Jacob von Chorus)
- fix a boot warning because deprecated hwmon API is used (Fabio
Estevam)
- a couple of fixes for rockchip thermal driver (Brian Norris, Caesar
Wang)
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: rockchip: fixes the conversion table
thermal: core: move tz->device.groups cleanup to thermal_release
thermal: thermal_hwmon: Convert to hwmon_device_register_with_info()
thermal: rockchip: handle set_trips without the trip points
thermal: rockchip: optimize the conversion table
thermal: rockchip: fixes invalid temperature case
thermal: rockchip: don't pass table structs by value
thermal: rockchip: improve conversion error messages
Diffstat (limited to 'tools/virtio/ringtest/main.h')
0 files changed, 0 insertions, 0 deletions