Merge remote-tracking branches 'regulator/topic/as3711', 'regulator/topic/axp20x...
authorMark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:50:25 +0000 (13:50 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:50:25 +0000 (13:50 +0100)

Trivial merge