Merge remote-tracking branch 'lsk/linux-linaro-lsk' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Sun, 15 Sep 2013 12:43:14 +0000 (13:43 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 15 Sep 2013 12:43:14 +0000 (13:43 +0100)

Trivial merge