Merge remote-tracking branch 'asoc/topic/rt286' into HEAD
authorMark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 22:16:47 +0000 (23:16 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 22:16:47 +0000 (23:16 +0100)

Trivial merge