Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/mt6311'...
authorMark Brown <broonie@kernel.org>
Tue, 12 Jan 2016 18:26:03 +0000 (18:26 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 12 Jan 2016 18:26:03 +0000 (18:26 +0000)

Trivial merge