Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 3 May 2013 08:30:29 +0000 (09:30 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 3 May 2013 08:30:29 +0000 (09:30 +0100)

Trivial merge