Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 16 Apr 2014 21:16:10 +0000 (22:16 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Apr 2014 21:16:10 +0000 (22:16 +0100)

Trivial merge