Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 23 May 2014 13:49:51 +0000 (14:49 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 23 May 2014 13:49:51 +0000 (14:49 +0100)

Trivial merge