Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 22:09:58 +0000 (23:09 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 22:09:58 +0000 (23:09 +0100)

Trivial merge