Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 17 Apr 2014 18:06:13 +0000 (19:06 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 17 Apr 2014 18:06:13 +0000 (19:06 +0100)

Trivial merge