Merge remote-tracking branch 'regulator/fix/axp20x' into regulator-linus
authorMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 12:17:19 +0000 (12:17 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 12:17:19 +0000 (12:17 +0000)

Trivial merge