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)
commit54a3da1c105ca91c4d32f25c3d9c57a61e9a3467
tree5be69ff9ccab03760f2ae17cbaecbfea0b016087
parent1c8bc7b3de5e76cb89aacdc7be1475a028af505f
parent90a3b7f8aba3011badacd6d8121e03aa24ac79d1
Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict
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