On Tue, Jan 03, 2012 at 09:11:59PM +0000, Arnd Bergmann wrote: > There were some conflicts between imx changes that went into the dma-slave > tree and those that went into arm-soc. Sascha, Shawn: can you have a look > to make sure the resolution below is correct? The resolution looks correct to me. -- Regards, Shawn