From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Nov 2013 20:50:08 +0000 (-0800)
Subject: Merge tag 'regulator-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: submit/tizen/20160607.132125~5565
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e45099e029bb6b369b27d8d4920db8caff5ecce;p=sdk%2Femulator%2Femulator-kernel.git

Merge tag 'regulator-v3.13-rc1' of git://git./linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A bunch of fixes, a few driver specific ones and a framework fix for
  voltage enumeration on fixed voltage regulators which had previously
  worked but had been misplaced during some refactoring causing problems
  for users that needed to know the voltage"

* tag 'regulator-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: arizona-micsupp: Correct wm5110 voltage selection
  regulator: pfuze100: allow misprogrammed ID
  regulator: fixed: fix regulator_list_voltage() for regression
  regulator: gpio-regulator: Don't oops on missing regulator-type property
---

8e45099e029bb6b369b27d8d4920db8caff5ecce