Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218...
authorMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 17:29:30 +0000 (18:29 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 17:29:30 +0000 (18:29 +0100)

Trivial merge