Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Mon, 18 Aug 2014 16:59:38 +0000 (11:59 -0500)
committerMark Brown <broonie@linaro.org>
Mon, 18 Aug 2014 16:59:38 +0000 (11:59 -0500)

Trivial merge