Merge remote-tracking branches 'regulator/fix/axp20x', 'regulator/fix/cpcap' and...
authorMark Brown <broonie@kernel.org>
Mon, 4 Sep 2017 16:54:35 +0000 (17:54 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 4 Sep 2017 16:54:35 +0000 (17:54 +0100)

Trivial merge