Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulato...
authorMark Brown <broonie@kernel.org>
Mon, 22 Jun 2015 10:19:56 +0000 (11:19 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 22 Jun 2015 10:19:56 +0000 (11:19 +0100)

Trivial merge