Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:32:25 +0000 (16:32 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:32:25 +0000 (16:32 +0100)
1  2 
sound/soc/codecs/wm8985.c

Simple merge