From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Jul 2016 19:22:16 +0000 (+0900)
Subject: Merge tag 'qcom-smd-list-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc1~2908
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63bab2203d54529ff1a7181b0575b58a9f3575cd;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'qcom-smd-list-voltage' of git://git./linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "Fix qcom-smd list voltage issues for msm8974

  This commit looks like a cleanup but in fact by causing the core to go
  down some simplified code paths for noop regulators it avoids a boot
  time crash for msm8974 platforms which was introduced in v4.7.  It has
  been in -next for a while, the issues in mainline for these platforms
  weren't flagged up to me until yesterday (I think it took some time to
  figure out what was going wrong)"

* tag 'qcom-smd-list-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: qcom_smd: Remove list_voltage callback for rpm_smps_ldo_ops_fixed
---

63bab2203d54529ff1a7181b0575b58a9f3575cd