]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict
authorMark Brown <broonie@kernel.org>
Mon, 10 Sep 2018 17:55:12 +0000 (18:55 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 10 Sep 2018 17:55:12 +0000 (18:55 +0100)
1  2 
MAINTAINERS
sound/soc/amd/acp-pcm-dma.c
sound/soc/sh/rcar/adg.c
sound/soc/sh/rcar/core.c
sound/soc/sh/rcar/dma.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge