Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/john.stultz...
authorMark Brown <broonie@linaro.org>
Mon, 12 May 2014 16:41:08 +0000 (17:41 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 12 May 2014 16:41:08 +0000 (17:41 +0100)

Trivial merge