Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Wed, 14 May 2014 16:29:25 +0000 (17:29 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 14 May 2014 16:29:25 +0000 (17:29 +0100)

Trivial merge