diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-22 10:52:54 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-22 10:52:54 -0800 |
commit | 5b442b1a4e9a19def99309b9831e276c21352ac1 (patch) | |
tree | b79879d9c4dc23837c44d506b8df9aeb28d79e36 /Documentation | |
parent | fea630215a9e767fd3917b2cb09ec3ded58f88a2 (diff) | |
parent | e61d2392253220477813b43412090dccdcac601f (diff) | |
download | linux-5b442b1a4e9a19def99309b9831e276c21352ac1.tar.bz2 |
Merge tag 'hwmon-for-v5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- Fix crash in w83627ehf driver seen with W83627DHG-P
- Fix lockdep splat in acpi_power_meter driver
- Fix xdpe12284 documentation Sphinx warnings
* tag 'hwmon-for-v5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (w83627ehf) Fix crash seen with W83627DHG-P
hwmon: (acpi_power_meter) Fix lockdep splat
Documentation/hwmon: fix xdpe12284 Sphinx warnings
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/hwmon/xdpe12284.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/hwmon/xdpe12284.rst b/Documentation/hwmon/xdpe12284.rst index 6b7ae98cc536..67d1f87808e5 100644 --- a/Documentation/hwmon/xdpe12284.rst +++ b/Documentation/hwmon/xdpe12284.rst @@ -24,6 +24,7 @@ This driver implements support for Infineon Multi-phase XDPE122 family dual loop voltage regulators. The family includes XDPE12284 and XDPE12254 devices. The devices from this family complaint with: + - Intel VR13 and VR13HC rev 1.3, IMVP8 rev 1.2 and IMPVP9 rev 1.3 DC-DC converter specification. - Intel SVID rev 1.9. protocol. |