Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 12 Feb 2014 20:42:20 +0000 (20:42 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 12 Feb 2014 20:42:20 +0000 (20:42 +0000)

Trivial merge