Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Mon, 31 Mar 2014 22:51:39 +0000 (23:51 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 31 Mar 2014 22:51:39 +0000 (23:51 +0100)

Trivial merge