Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm8731', 'asoc/topic...

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

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

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

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