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

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

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