Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Tue, 6 Aug 2013 12:58:59 +0000 (13:58 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 6 Aug 2013 12:58:59 +0000 (13:58 +0100)

Trivial merge