]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'hwmon-for-v5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Nov 2019 18:28:59 +0000 (11:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Nov 2019 18:28:59 +0000 (11:28 -0700)
Pull hwmon fixes from Guenter Roeck:

 - Fix read timeout problem in ina3221 driver

 - Fix wrong bitmask in nct7904 driver

* tag 'hwmon-for-v5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (ina3221) Fix read timeout issue
  hwmon: (nct7904) Fix the incorrect value of vsen_mask & tcpu_mask & temp_mode in nct7904_data struct.


Trivial merge