Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 9 May 2014 11:06:18 +0000 (12:06 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 9 May 2014 11:06:18 +0000 (12:06 +0100)

Trivial merge