Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Mon, 19 May 2014 18:44:46 +0000 (19:44 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 19 May 2014 18:44:46 +0000 (19:44 +0100)

Trivial merge