Merge remote-tracking branch 'asoc/fix/spear' into asoc-linus
authorMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 14:18:59 +0000 (14:18 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 14:18:59 +0000 (14:18 +0000)

Trivial merge