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

Trivial merge