Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 25 Jun 2014 10:42:00 +0000 (11:42 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 25 Jun 2014 10:42:00 +0000 (11:42 +0100)

Trivial merge