Merge remote-tracking branches 'regulator/fix/stw481x' and 'regulator/fix/tps65086...
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