Merge remote-tracking branch 'lsk/v3.10/topic/juno' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Fri, 13 Jun 2014 18:38:51 +0000 (19:38 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 13 Jun 2014 18:38:51 +0000 (19:38 +0100)

Trivial merge