Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 22:10:32 +0000 (23:10 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 22:10:32 +0000 (23:10 +0100)

Trivial merge