Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s5m8767...
authorMark Brown <broonie@linaro.org>
Thu, 23 Jan 2014 12:01:31 +0000 (12:01 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 23 Jan 2014 12:01:31 +0000 (12:01 +0000)

Trivial merge