Merge remote-tracking branches 'regulator/fix/email' and 'regulator/fix/qcom-smd...
authorMark Brown <broonie@kernel.org>
Tue, 6 Sep 2016 11:31:34 +0000 (12:31 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 6 Sep 2016 11:31:34 +0000 (12:31 +0100)

Trivial merge