Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 27 Jun 2014 09:59:38 +0000 (10:59 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 27 Jun 2014 09:59:38 +0000 (10:59 +0100)

Trivial merge