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)
commit514918f0d1c3e7cf78fe2acbe80f7b616065e210
treef6a918d115acf0347ee69b2b90aada657a68ef96
parent9450d92c8c647752586eeeb7927da8a50a691c96
parentfc7dc61d9a87011aaf8a6eb3144ebf9552adf5d2
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
sound/soc/codecs/cs42l52.h
sound/soc/codecs/wm5110.c