diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-24 18:36:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-24 18:36:15 -0700 |
| commit | 260eaba4eaf0daec2e21735de30de14b1d6a4d08 (patch) | |
| tree | 848718353c5c4edf2846b85f5cdce2c615e28323 | |
| parent | ed13fbbf871cf0198b283c563b6394b02b31646c (diff) | |
| parent | 5ce91714b0d8c0a3ff9b858966721f508351cf4c (diff) | |
Merge tag 'hwmon-for-linus-v4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fix from Guenter Roeck:
"Improve fan type detection for dell-smm to prevent kernel hang"
* tag 'hwmon-for-linus-v4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (dell-smm) Cache fan_type() calls and change fan detection