Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/st-pwm...
authorMark Brown <broonie@linaro.org>
Wed, 26 Mar 2014 16:58:18 +0000 (16:58 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 26 Mar 2014 16:58:18 +0000 (16:58 +0000)

Trivial merge