Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 25 Jul 2014 11:59:39 +0000 (12:59 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 25 Jul 2014 11:59:39 +0000 (12:59 +0100)

Trivial merge