From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Jun 2013 21:34:51 +0000 (+0900)
Subject: Merge tag 'regulator-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~370
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=042dd60ca6dec9a02cefa8edd67de386e35755d6;p=firefly-linux-kernel-4.4.55.git

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

Pull regulator fixes from Mark Brown:
 "A few small fixes for v3.10, documentation things in the core and a
  few driver bugs."

* tag 'regulator-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: palmas: Fix "enable_reg" to point to the correct reg for SMPS10
  regulator: palmas: Fix incorrect condition
  regulator: core: Correct spelling mistake in comment
  regulator: dbx500: Make local symbol static
  regulator: Fix kernel-doc generation warnings.
---

042dd60ca6dec9a02cefa8edd67de386e35755d6