From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Jul 2020 17:20:26 +0000 (-0700)
Subject: Merge tag 'regulator-fix-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.10.7~2121
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8da822e8a573767c4777a4b3f11ee12954a8cd0e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'regulator-fix-v5.8-rc5' of git://git./linux/kernel/git/broonie/regulator into master

Pull regulator fixes from Mark Brown:
 "The more substantial fix here is the rename of the da903x driver which
  fixes a collision with the parent MFD driver name which caused issues
  when things were built as modules.

  There's also a fix for a mislableled regulator on the pmi8994 which is
  quite important for systems with that device"

* tag 'regulator-fix-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  MAINTAINERS: remove obsolete entry after file renaming
  regulator: rename da903x to da903x-regulator
  regulator: qcom_smd: Fix pmi8994 label
---

8da822e8a573767c4777a4b3f11ee12954a8cd0e