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

Trivial merge