Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 30 May 2014 17:27:01 +0000 (18:27 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 30 May 2014 17:27:01 +0000 (18:27 +0100)

Trivial merge