Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 8 May 2014 09:55:51 +0000 (10:55 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 8 May 2014 09:55:51 +0000 (10:55 +0100)

Trivial merge