Merge remote-tracking branches 'regulator/fix/ab3100' and 'regulator/fix/s2mps11...
authorMark Brown <broonie@linaro.org>
Tue, 4 Feb 2014 12:58:19 +0000 (12:58 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 4 Feb 2014 12:58:19 +0000 (12:58 +0000)

Trivial merge