Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Sun, 8 Sep 2013 12:24:43 +0000 (13:24 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 8 Sep 2013 12:24:43 +0000 (13:24 +0100)

Trivial merge