Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/arizona', 'asoc/topic...

diff --cc sound/soc/atmel/atmel-pdmic.c
Simple merge

diff --cc sound/soc/codecs/cs47l24.c
Simple merge

diff --cc sound/soc/codecs/cs53l30.c
Simple merge

diff --cc sound/soc/codecs/da7213.c
Simple merge

diff --cc sound/soc/codecs/nau8825.c
Simple merge

diff --cc sound/soc/codecs/rt5514.c
Simple merge

diff --cc sound/soc/codecs/rt5640.c
Simple merge

diff --cc sound/soc/codecs/wm2000.c
Simple merge

diff --cc sound/soc/codecs/wm5102.c
Simple merge

diff --cc sound/soc/codecs/wm5110.c
Simple merge

diff --cc sound/soc/codecs/wm8998.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge