Messages in this thread | | | Date | Wed, 21 Dec 2011 12:20:46 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the slave-dma tree with the arm-soc tree |
| |
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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |