Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 22 Jan 2014 15:35:34 +0000 (15:35 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 22 Jan 2014 15:35:34 +0000 (15:35 +0000)

Trivial merge