Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict

diff --cc MAINTAINERS
Simple merge

diff --cc sound/soc/amd/acp-pcm-dma.c
Simple merge

diff --cc sound/soc/sh/rcar/adg.c
Simple merge

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

diff --cc sound/soc/sh/rcar/dma.c
Simple merge