diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-05 15:52:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-05 15:52:26 -0800 |
| commit | 71c27a8c67e85b216f150696b04f698bff9256fa (patch) | |
| tree | b491dd902006a95da65215f5aa6419542028702c /drivers/block | |
| parent | 4293242db153512dcfc7e7af9af683e5b97dd4ce (diff) | |
| parent | a6a671e1b6f6e68b642445ad3cac46f8ffb46f5c (diff) | |
| download | op-kernel-dev-71c27a8c67e85b216f150696b04f698bff9256fa.zip op-kernel-dev-71c27a8c67e85b216f150696b04f698bff9256fa.tar.gz | |
Merge tag 'regulator-v3.14-rc1' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/block')
0 files changed, 0 insertions, 0 deletions
