Merge remote-tracking branch 'lsk/v3.10/topic/pe-wq' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Mon, 20 Jan 2014 18:13:56 +0000 (18:13 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 20 Jan 2014 18:13:56 +0000 (18:13 +0000)

Trivial merge