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

Trivial merge