Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Mon, 18 Aug 2014 17:00:14 +0000 (12:00 -0500)
committerMark Brown <broonie@linaro.org>
Mon, 18 Aug 2014 17:00:14 +0000 (12:00 -0500)

Trivial merge