| commit | af5d28565f5822fb6a280d2de07315dad487f1f1 | [log] [tgz] | 
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 18 09:38:09 2017 -0700 | 
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 18 09:38:09 2017 -0700 | 
| tree | 2c5eab1568ef19b79322de65e6834a5a0d859862 | |
| parent | dac94e29110cd606dec37673644caf2cf6fd1dde [diff] | |
| parent | 90b4f30b6d15222a509dacf47f29efef2b22571e [diff] | 
Merge tag 'hwmon-for-linus-v4.12-rc2' of git://git.kernel.org/pub/scm/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