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

Trivial merge