Merge remote-tracking branch 'lsk/linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Tue, 21 Jan 2014 19:19:37 +0000 (19:19 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 21 Jan 2014 19:19:37 +0000 (19:19 +0000)

Trivial merge