Merge tag 'hwmon-for-linus-v4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Jun 2016 19:18:34 +0000 (12:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Jun 2016 19:18:34 +0000 (12:18 -0700)
commitc8f17d60645cc38cbe5f6e2b2f93370483b28895
treeea1a4bb50ca5522d15154f34a122698dbc5222bd
parentf5364c150aa645b3d7daa21b5c0b9feaa1c9cd6d
parent38bab98a8da4a2ff5c3f55b045b0c8bf6901362f
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