Merge remote-tracking branches 'asoc/topic/max98373', 'asoc/topic/mtk', 'asoc/topic...

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

diff --cc sound/soc/rockchip/rk3399_gru_sound.c
Simple merge

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