From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 Feb 2014 23:52:26 +0000 (-0800)
Subject: Merge tag 'regulator-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.14-rc2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71c27a8c67e85b216f150696b04f698bff9256fa;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Pull regulator fixes from Mark Brown:
 "A couple of driver fixes here but the main thing is a fix to the
  checks for deferred probe non-DT systems with fully specified
  regulators which had been broken by a device tree fix which meant that
  we wouldn't insert optional regulators.

  This had slipped through the cracks since very few systems do that in
  the first place and those that do it in mainline don't need optional
  regulators anyway"

* tag 'regulator-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: s2mps11: Fix NULL pointer of_node value when using platform data
  regulator: core: Correct default return value for full constraints
  regulator: ab3100: cast fix
---

71c27a8c67e85b216f150696b04f698bff9256fa