Merge "regulator: Fix recursive mutex lockdep warning" into msm-3.4