Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 30 May 2014 10:14:25 +0000 (11:14 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 30 May 2014 10:14:25 +0000 (11:14 +0100)

Trivial merge