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

diff --cc include/sound/soc.h
Simple merge

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

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

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