From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Jul 2015 21:48:26 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~5104
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19127af9d81f0fcecc3e54fab64b7a7f2f91a92b;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'hwmon-for-linus-v4.2-rc1' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "Two patches headed for stable:
   - Fix broken output scaling in mcp3021 driver
   - Fix attribute visibility in nct7802 driver

  One regression:
   - Fix name attribute in dell-smm-hwmon driver"

* tag 'hwmon-for-linus-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (mcp3021) Fix broken output scaling
  hwmon: (nct7802) fix visibility of temp3
  hwmon: (dell-smm-hwmon) Use a valid name attribute
---

19127af9d81f0fcecc3e54fab64b7a7f2f91a92b