Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 09:46:59 +0000 (10:46 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 09:46:59 +0000 (10:46 +0100)

Trivial merge