linux-next: manual merge of the sound-asoc tree with the slave-dmatree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/imx/imx-pcm-dma-mx2.c between commit c0fa6c8af7ab ("ASoC: i.MX:
Add missing dma_async_issue_pending") from the slave-dma tree and commit
c307e8e32e11 ("ASoC: imx-pcm-dma: Use dmaengine PCM helper functions")
from the sound-asoc tree.

The latter removed the code modified by the former, so hopefully the
former change is subsumed into the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature