From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Jun 2016 19:18:34 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus-v4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.7~171
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8f17d60645cc38cbe5f6e2b2f93370483b28895;p=platform%2Fkernel%2Flinux-amlogic.git

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

Pull hwmon fixes from Guenter Roeck:

 - fix regression in fam15h_power driver

 - minor variable type fix in lm90 driver

 - document compatible statement for ina2xx driver

* tag 'hwmon-for-linus-v4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (lm90) use proper type for update_interval
  hwmon: (ina2xx) Document compatible for INA231
  hwmon: (fam15h_power) Disable preemption when reading registers
---

c8f17d60645cc38cbe5f6e2b2f93370483b28895