From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Jun 2013 19:18:37 +0000 (-1000)
Subject: Merge tag 'regulator-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~256
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=34a08681832f835269670b1d72e45f48b014375f;p=firefly-linux-kernel-4.4.55.git

Merge tag 'regulator-v3.10-rc7' of git://git./linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "Fix module loading for tps6586x.

  A simple one liner fix to make module loading work for distros
  (product specific kernels tend to have things built in)"

* tag 'regulator-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  mfd: tps6586x: correct device name of the regulator cell
---

34a08681832f835269670b1d72e45f48b014375f