From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Mar 2022 17:58:28 +0000 (-0700)
Subject: Merge tag 'regulator-fix-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.1-rc5~1665
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f3730117f162b17147795eaad44421cc65178c7;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'regulator-fix-v5.18' of git://git./linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A couple of fixes for the rt4831 driver which fix features that didn't
  work due to incomplete description of the register configuration"

* tag 'regulator-fix-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: rt4831: Add active_discharge_on to fix discharge API
  regulator: rt4831: Add bypass mask to fix set_bypass API work
---

4f3730117f162b17147795eaad44421cc65178c7