From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Nov 2019 18:28:59 +0000 (-0700)
Subject: Merge tag 'hwmon-for-v5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Tag: v5.4-rc6~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d2345057538bb97b1e556508ad69983f446462f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'hwmon-for-v5.4-rc6' of git://git./linux/kernel/git/groeck/linux-staging

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

9d2345057538bb97b1e556508ad69983f446462f