Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android...
authorMark Brown <broonie@linaro.org>
Thu, 19 Jun 2014 10:40:21 +0000 (11:40 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 19 Jun 2014 10:40:21 +0000 (11:40 +0100)

Trivial merge