From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jun 2016 01:36:15 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus-v4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.7-rc5~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=260eaba4eaf0daec2e21735de30de14b1d6a4d08;p=linux.git

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

260eaba4eaf0daec2e21735de30de14b1d6a4d08