Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 12 Jun 2014 14:52:14 +0000 (15:52 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 12 Jun 2014 14:52:14 +0000 (15:52 +0100)

Trivial merge