summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-04 17:45:38 +0100
committerMark Brown <broonie@kernel.org>2017-09-04 17:45:38 +0100
commit0ab912978c626ea6afd6ee85845ba9356fcda8cc (patch)
treed2fae88d09d9c611d75fb24282b33403f0bc088c /drivers
parent0bbc0a0a0270ecb1cc8726c6ea663320b4b5e551 (diff)
parentda2629684822091bf15c6c14d8e33b75dfce8637 (diff)
parent4ebb9d7f901027e1740f69829cf10af0193e8e17 (diff)
parent423a11647c53e9d7ebbea1c61bc469ea13dafeff (diff)
Merge remote-tracking branches 'regulator/fix/axp20x', 'regulator/fix/cpcap' and 'regulator/fix/of' into regulator-linus