diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-23 17:37:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-23 17:37:25 -0800 |
commit | 24c852584066341dc99b738ebf85369f1f7ee335 (patch) | |
tree | 94cb773024d3881f594202998431975421116aeb /include/linux/mfd/max8997-private.h | |
parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | Merge remote-tracking branches 'regulator/fix/da9063', 'regulator/fix/max14577' and 'regulator/fix/s5m8767' into regulator-linus (diff) | |
download | linux-dev-24c852584066341dc99b738ebf85369f1f7ee335.tar.xz linux-dev-24c852584066341dc99b738ebf85369f1f7ee335.zip |
Merge tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"Mostly unexciting driver fixes, plus one fix to lower the severity of
the log message when we don't use an optional regulator - the fixes
for ACPI system made this come up more often and it was correctly
observed that it was causing undue concern for users"
* tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: max14577: Fix invalid return value on DT parse success
regulator: core: Change dummy supplies error message to a warning
regulator: s5m8767: Add missing of_node_put
regulator: s5m8767: Use of_get_child_by_name
regulator: da9063: Bug fix when setting max voltage on LDOs 5-11
Diffstat (limited to 'include/linux/mfd/max8997-private.h')
0 files changed, 0 insertions, 0 deletions