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

Trivial merge