Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

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

diff --cc sound/soc/intel/boards/bxt_da7219_max98357a.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-topology.c
Simple merge

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