Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/axp20...
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:03 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:03 +0000 (17:08 +0100)

Trivial merge