]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit - drivers/hid/i2c-hid/i2c-hid.c
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Jan 2017 20:36:47 +0000 (12:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Jan 2017 20:36:47 +0000 (12:36 -0800)
commitbb6c01c2dde67b165cf7c808b0f00677b6f94b96
tree91187e97fc13f25a1aac4a60f333c76125dab0f6
parentc497f8d17246720afe680ea1a8fa6e48e75af852
parentbad94f8068122b6342a73a218dad7d41e6ea907b
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