Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 13:18:15 +0000 (14:18 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 13:18:15 +0000 (14:18 +0100)

Trivial merge