]> www.infradead.org Git - users/willy/pagecache.git/commit
Merge tag 'regulator-fix-v6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Feb 2025 21:09:01 +0000 (13:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Feb 2025 21:09:01 +0000 (13:09 -0800)
commit85cc5751db7cc3211945bc380c944de6fe6979d1
treef122ca800fc63cfad856a1d0a04a9ea4901c0925
parentf9af8e7718904f0b77595d1b610c96dd7796c655
parent35e21de48e693af1dcfdbf2dc3d73dcfa3c8f2d9
Merge tag 'regulator-fix-v6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "The main change here is a revert for a cleanup that was done in the
  core, attempting to resolve some confusion about how we handle systems
  where we've somehow managed to end up with both platform data and
  device tree data for the same device. Unfortunately it turns out there
  are actually a few systems that deliberately do this and were broken
  by the change so we've just reverted it.

  There's also a new Qualcomm device ID"

* tag 'regulator-fix-v6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: core: let dt properties override driver init_data
  regulator: qcom_smd: Add l2, l5 sub-node to mp5496 regulator