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

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
Simple merge

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

diff --cc sound/soc/codecs/arizona.h
Simple merge

diff --cc sound/soc/codecs/cs47l24.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/wm_adsp.c
Simple merge