summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-06-13 18:51:57 +0300
committerMark Brown <broonie@kernel.org>2016-06-13 18:51:57 +0300
commit0d2a8ef4395e84aa9623ac1e282417c75a73490c (patch)
treeb7d56af2d4f89bbb58bf402a6775de73d14b96c5 /drivers/regulator
parent5edb56491d4812c42175980759da53388e5d86f5 (diff)
parent3bfbb4d1a480cc17f6ccfce13b76eb6c0dbeaf8c (diff)
parentc714a588fc39dc8c8f70014f5691217717983fb3 (diff)
downloadlinux-0d2a8ef4395e84aa9623ac1e282417c75a73490c.tar.xz
Merge remote-tracking branches 'regulator/fix/qcom-smd' and 'regulator/fix/tps51632' into regulator-linus