Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 22 May 2014 10:36:03 +0000 (11:36 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 22 May 2014 10:36:03 +0000 (11:36 +0100)

Trivial merge