Merge commit 'ed30f24e8d07d30aa3e69d1f508f4d7bd2e8ea14' of git://git.linaro.org/landi...
authorMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 10:46:14 +0000 (11:46 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 10:46:14 +0000 (11:46 +0100)

Trivial merge