Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Mon, 12 May 2014 18:10:50 +0000 (19:10 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 12 May 2014 18:10:50 +0000 (19:10 +0100)

Trivial merge