Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 14:54:30 +0000 (15:54 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 17 Jun 2014 14:54:30 +0000 (15:54 +0100)

Trivial merge