Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 22 Aug 2014 04:00:34 +0000 (23:00 -0500)
committerMark Brown <broonie@linaro.org>
Fri, 22 Aug 2014 04:00:34 +0000 (23:00 -0500)

Trivial merge