Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Tue, 20 May 2014 00:02:49 +0000 (01:02 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 20 May 2014 00:02:49 +0000 (01:02 +0100)

Trivial merge