Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 13 Dec 2013 17:25:16 +0000 (17:25 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 13 Dec 2013 17:25:16 +0000 (17:25 +0000)

Trivial merge