Merge remote-tracking branches 'regulator/topic/mt6311', 'regulator/topic/ocp', ...
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 13:39:48 +0000 (14:39 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 13:39:48 +0000 (14:39 +0100)

Trivial merge