summaryrefslogtreecommitdiff
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-20 18:02:01 +0100
committerMark Brown <broonie@kernel.org>2016-07-20 18:02:01 +0100
commit5fea0902eaae023a0bf97a05cdd38e54fafdc426 (patch)
tree179e1f075fe3ff7d7eed7bb03ee67e246c585d1f /include/linux/regulator
parent38cdaddf56c56e6c99360942ca4d3eaf4c99d184 (diff)
parent842a8824274de3fbbc8e230355d5c75237453bf5 (diff)
parentfc1e1c4a249e8bf0aff68576fad776dd5adc0562 (diff)
parent2d0cf04ce166581c617f8943a116587a730f40b6 (diff)
parent7524c1cebc0a4e2ab186fcb5f87116f3d9018ee4 (diff)
Merge remote-tracking branches 'regulator/topic/act8865', 'regulator/topic/can-change-voltage', 'regulator/topic/da9210' and 'regulator/topic/da9211' into regulator-next