Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 09:46:54 +0000 (10:46 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 09:46:54 +0000 (10:46 +0100)

Trivial merge