diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-17 15:58:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-17 15:58:12 -0700 |
| commit | 3acf4e395260e3bd30a6fa29ba7eada4bf7566ca (patch) | |
| tree | 1b8e3641d63895bf8f4aa67a69f8009684f66179 /net/lapb/lapb_timer.c | |
| parent | 58ddfe6c3af91d320cf5d0aba33143e7c1d8dc35 (diff) | |
| parent | 3b031622f598481970400519bd5abc2a16708282 (diff) | |
Merge tag 'hwmon-for-linus-v4.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Two k10temp fixes:
- fix race condition when accessing System Management Network
registers
- fix reading critical temperatures on F15h M60h and M70h
Also add PCI ID's for the AMD Raven Ridge root bridge"
* tag 'hwmon-for-linus-v4.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (k10temp) Use API function to access System Management Network
x86/amd_nb: Add support for Raven Ridge CPUs
hwmon: (k10temp) Fix reading critical temperature register
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions