Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/john.stultz...
authorMark Brown <broonie@linaro.org>
Thu, 12 Jun 2014 09:41:50 +0000 (10:41 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 12 Jun 2014 09:41:50 +0000 (10:41 +0100)

Trivial merge