Merge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/max77693...
authorMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:14:37 +0000 (11:14 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:14:37 +0000 (11:14 +0000)

Trivial merge