Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Sun, 21 Jul 2013 23:12:39 +0000 (00:12 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 21 Jul 2013 23:12:39 +0000 (00:12 +0100)

Trivial merge