Merge remote-tracking branches 'asoc/topic/au1x', 'asoc/topic/bcm2835', 'asoc/topic...

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

diff --cc sound/soc/mediatek/mt8173-max98090.c
Simple merge

diff --cc sound/soc/mediatek/mt8173-rt5650-rt5676.c
Simple merge

diff --cc sound/soc/samsung/arndale_rt5631.c
Simple merge