Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Tue, 14 Jan 2014 20:24:04 +0000 (20:24 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 14 Jan 2014 20:24:04 +0000 (20:24 +0000)

Trivial merge