Merge remote-tracking branch 'lsk/v3.10/topic/misc' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Wed, 21 Aug 2013 15:11:36 +0000 (16:11 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 Aug 2013 15:11:36 +0000 (16:11 +0100)

Trivial merge