summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-19 16:40:22 +0000
committerMark Brown <broonie@kernel.org>2017-02-19 16:40:22 +0000
commit0fe3f971fc83bfd709b70f8ac822ad6db4a05c9e (patch)
tree5718158378a061f45b900a11897f53f78f9dd1e2 /drivers/regulator
parent1c35539cd76848bc65d791c6741e3f0195901f5f (diff)
parente42a46b6f52473661ad192f76a128a68fe301df4 (diff)
parent6308f1787fb85bc98b7241a08a9f7f33b47f8b61 (diff)
Merge remote-tracking branches 'regulator/fix/debugfs' and 'regulator/fix/tps65086' into regulator-linus