Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 20 Aug 2014 16:38:25 +0000 (11:38 -0500)
committerMark Brown <broonie@linaro.org>
Wed, 20 Aug 2014 16:38:25 +0000 (11:38 -0500)

Trivial merge