From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Oct 2022 23:04:34 +0000 (-0700)
Subject: Merge tag 'hwmon-for-v6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d47136c2801540e80f41ec7e063d8d592568ad76;p=linux.git

Merge tag 'hwmon-for-v6.1-rc2' of git://git./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
---

d47136c2801540e80f41ec7e063d8d592568ad76