Merge remote-tracking branch 'lsk/linux-linaro-lsk-android' into linux-linaro-lsk...
authorMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 09:46:58 +0000 (10:46 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 09:46:58 +0000 (10:46 +0100)

Trivial merge