Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 11 Apr 2014 19:30:42 +0000 (20:30 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 11 Apr 2014 19:30:42 +0000 (20:30 +0100)

Trivial merge