Merge remote-tracking branches 'asoc/topic/ak4613', 'asoc/topic/core', 'asoc/topic...

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

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

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