Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/dai' and 'asoc/topic...

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

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

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