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

Trivial merge