Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/devm', 'asoc/topic...

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

diff --cc sound/soc/fsl/fsl_spdif.c
Simple merge

diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge