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

Trivial merge