Merge remote-tracking branch 'lsk/linux-linaro-lsk' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 5 Dec 2013 10:15:12 +0000 (10:15 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 5 Dec 2013 10:15:12 +0000 (10:15 +0000)

Trivial merge