Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 21 Aug 2013 15:11:52 +0000 (16:11 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 Aug 2013 15:11:52 +0000 (16:11 +0100)

Trivial merge