Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Sun, 1 Jun 2014 16:31:46 +0000 (17:31 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 1 Jun 2014 16:31:46 +0000 (17:31 +0100)

Trivial merge