Samuel Ortiz wrote: > Hi Richard, > > On Fri, Apr 16, 2010 at 06:27:54PM +0200, Richard Röjfors wrote: >> To follow are two patches. >> >> The first one adds the timberdale video-in driver to the media tree. >> >> The second one adds it to the timberdale MFD driver. >> >> The Kconfig of the media patch selects TIMB_DMA which is introduced >> in the DMA tree, that's why I cc:d in Dan. >> >> Samuel and Mauro hope you can support and solve the potential merge >> issue between your two trees. > Mauro, the mfd part of this patch depends on the video one. Do you mind if I > take both through my tree, after getting your Acked-by ? No problem. I'll let you know after I get my ack. -- Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html