Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Thu, 4 Dec 2014 17:20:01 +0000 (17:20 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 4 Dec 2014 17:20:01 +0000 (17:20 +0000)

Trivial merge