Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Tue, 17 Dec 2013 21:01:41 +0000 (21:01 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 17 Dec 2013 21:01:41 +0000 (21:01 +0000)

Trivial merge