Merge remote-tracking branch 'lsk/v3.10/topic/misc' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Tue, 17 Dec 2013 21:01:28 +0000 (21:01 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 17 Dec 2013 21:01:28 +0000 (21:01 +0000)

Trivial merge