Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 19 Jul 2013 11:37:20 +0000 (12:37 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 19 Jul 2013 11:37:20 +0000 (12:37 +0100)

Trivial merge