Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
authorMark Brown <broonie@linaro.org>
Wed, 30 Oct 2013 17:11:55 +0000 (10:11 -0700)
committerMark Brown <broonie@linaro.org>
Wed, 30 Oct 2013 17:11:55 +0000 (10:11 -0700)

Trivial merge