Merge remote-tracking branches 'regulator/fix/fixed' and 'regulator/fix/twl6040'...
authorMark Brown <broonie@kernel.org>
Fri, 3 Feb 2017 11:39:46 +0000 (12:39 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 3 Feb 2017 11:39:46 +0000 (12:39 +0100)

Trivial merge