Merge remote-tracking branch 'asoc/fix/spear' into asoc-linus
authorMark Brown <broonie@linaro.org>
Wed, 12 Mar 2014 23:03:57 +0000 (23:03 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 12 Mar 2014 23:03:57 +0000 (23:03 +0000)

Trivial merge