Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Mon, 14 Apr 2014 17:56:49 +0000 (18:56 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 14 Apr 2014 17:56:49 +0000 (18:56 +0100)

Trivial merge