Re: [GIT PULL] slave-dmaengine updates

[Vinod Koul]

On Tue, 2012-01-17 at 18:41 -0800, Linus Torvalds wrote:
> On Mon, Jan 16, 2012 at 7:06 AM, Vinod Koul <vinod.koul@xxxxxxxxx> wrote:
> >
> > Here is the slave-dmaengine updates which include a new DMA engine API
> > for 2D interleaved transfers along with fixes for slave dma_tranfer
> > direction along with usual fixes and updates on bunch of the slave dma
> > drivers.
> 
> Ok, please verify my conflict resolution. It all looked pretty
> trivial, but affected code that I don't know nor can I even
> test-compile.
The resolution look fine to me. I have built and didn't find any issues.

Thanks
-- 
~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/