linux-next: manual merge of the sound-asoc tree with the l2-mtd tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/mxs/mxs-pcm.h between commit 7079e020563c ("mxs-dma : move the
mxs dma.h to a more common place") from the l2-mtd tree and commit
016ab467aa53 ("ASoC: mxs-pcm: Use dmaengine PCM helper functions") from
the sound-asoc tree.

The latter seems to remove the need for the include updated by the
former, so I removed it.
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpHj5ozhrx6R.pgp
Description: PGP signature

[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Add to Google Powered by Linux