Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/uda134x', 'asoc/topic...

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

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

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

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

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