Re: [PATCH v2 08/19] dma: MX3_IPU fix depends

From: Vinod Koul
Date: Fri Dec 23 2011 - 11:14:26 EST


On Fri, 2011-12-23 at 17:04 +0100, Eric BÃnard wrote:
> if I followed everything (see Stephen Rothwell mail titled
> "linux-next: manual
> merge of the slave-dma tree with the arm-soc tree"), this patch was
> not
> applieed because the problem was already fixed in commit 8e2d41f8c856
> ("dma
> i.MX: remove individual SOC dependency") from the slave-dma tree
>
Okay thanks,
I will check the merge conflict

--
~Vinod

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/