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

Trivial merge