linux-next: manual merge of the slave-dma tree with the arm-soctree

[Stephen Rothwell]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/Kconfig between commit eb444fee9289 ("dma: MX3_IPU fix
depends") from the arm-soc tree and commit 8e2d41f8c856 ("dma i.MX:
remove individual SOC dependency") from the slave-dma tree.

The latter seems to be a superset of the former, so I used that
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature