From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 May 2017 16:38:09 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~5577
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=af5d28565f5822fb6a280d2de07315dad487f1f1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

af5d28565f5822fb6a280d2de07315dad487f1f1