Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 10:47:02 +0000 (11:47 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 10:47:02 +0000 (11:47 +0100)

Trivial merge