summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-10-23 02:04:34 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-10-23 02:04:34 +0300
commitd47136c2801540e80f41ec7e063d8d592568ad76 (patch)
tree5ab55698a7c440f8e2403e95fd9366fc1c729c8c /Documentation
parentcda5d920545c0f81554bfd241b190d3cb5c5da14 (diff)
parent5619c6609130bce910736a61724a5ee033a0822c (diff)
downloadlinux-d47136c2801540e80f41ec7e063d8d592568ad76.tar.xz
Merge tag 'hwmon-for-v6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck: - corsair-psu: Fix typo in USB id description, and add USB ID for new PSU - pwm-fan: Fix fan power handling when disabling fan control * tag 'hwmon-for-v6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (corsair-psu) Add USB id of the new HX1500i psu hwmon: (pwm-fan) Explicitly switch off fan power when setting pwm1_enable to 0 hwmon: (corsair-psu) fix typo in USB id description
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/hwmon/corsair-psu.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/hwmon/corsair-psu.rst b/Documentation/hwmon/corsair-psu.rst
index 3c1b164eb3c0..6a03edb551a8 100644
--- a/Documentation/hwmon/corsair-psu.rst
+++ b/Documentation/hwmon/corsair-psu.rst
@@ -19,6 +19,8 @@ Supported devices:
Corsair HX1200i
+ Corsair HX1500i
+
Corsair RM550i
Corsair RM650i