summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-20 18:01:59 +0100
committerMark Brown <broonie@kernel.org>2016-07-20 18:01:59 +0100
commit02214f10610e5e5d1187db1f594f2aba20e1a52e (patch)
tree9d4cf8dca74303cd50ee833a222e9ac41694f18e /drivers/regulator
parent92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff)
parent707319b60ade4fefa4fc31138f4147f2a5abb88b (diff)
parent04c16b84e49a6d609c88f4f5523237ece3612b74 (diff)
Merge remote-tracking branches 'regulator/fix/da9053' and 'regulator/fix/s2mps11' into regulator-linus