Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
authorMark Brown <broonie@linaro.org>
Fri, 15 Nov 2013 10:20:08 +0000 (10:20 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 15 Nov 2013 10:20:08 +0000 (10:20 +0000)
1  2 
sound/soc/codecs/cs42l52.h
sound/soc/codecs/wm5110.c

Simple merge
Simple merge