diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-02 11:28:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-02 11:28:59 -0700 |
| commit | 9d2345057538bb97b1e556508ad69983f446462f (patch) | |
| tree | c39ae2e909312d73e9a551db9318de9ede910952 /fs/timerfd.c | |
| parent | e935842a06dbcdefcdd93174a97010f22a36e26d (diff) | |
| parent | 2ccb4f16d013a0954459061d38172b1c53553ba6 (diff) | |
Merge tag 'hwmon-for-v5.4-rc6' of git://git.kernel.org/pub/scm/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.
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions