Merge tag 'hwmon-for-linus-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 May 2017 16:38:09 +0000 (09:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 May 2017 16:38:09 +0000 (09:38 -0700)
commitaf5d28565f5822fb6a280d2de07315dad487f1f1
tree2c5eab1568ef19b79322de65e6834a5a0d859862
parentdac94e29110cd606dec37673644caf2cf6fd1dde
parent90b4f30b6d15222a509dacf47f29efef2b22571e
Merge tag 'hwmon-for-linus-v4.12-rc2' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Fix problem with hotplug state machine in coretemp driver"

* tag 'hwmon-for-linus-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (coretemp) Handle frozen hotplug state correctly