summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-12 18:26:03 +0000
committerMark Brown <broonie@kernel.org>2016-01-12 18:26:03 +0000
commit353915f0b43fb156c3bf02d54d9f3dbdcbe66afe (patch)
treec1043c8eb9803b01105f30c2efac7beafdc75bfa /drivers/regulator
parent3ad4b0517b6510a53d791f9ead531a08bda3bcdd (diff)
parent3cb99e2ea99a454c8837a55aac88753ef05fc1eb (diff)
parentaab3c3f34cc2dd8230052770712606d65de6538f (diff)
Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/mt6311' into regulator-linus