Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Tue, 20 Aug 2013 17:03:34 +0000 (18:03 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 20 Aug 2013 17:03:34 +0000 (18:03 +0100)

Trivial merge