Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Sun, 18 May 2014 17:45:52 +0000 (18:45 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 18 May 2014 17:45:52 +0000 (18:45 +0100)

Trivial merge