Messages in this thread | | | Date | Mon, 21 Nov 2011 11:08:37 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the slave-dma tree with the s5p tree |
| |
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in drivers/dma/pl330.c between commit fc0b5cccc8dd ("DMA: PL330: Infer transfer direction from transfer request instead of platform data") from the s5p tree and commit db8196df4bb6 ("dmaengine: move drivers to dma_transfer_direction") from the slave-dma tree.
The former removed the code modified by the latter, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |