Em 13-09-2010 10:39, Samuel Ortiz escreveu: > Hi Mauro, > > On Wed, Sep 08, 2010 at 04:39:42PM -0300, Mauro Carvalho Chehab wrote: >> Em 02-09-2010 08:56, Richard Röjfors escreveu: >>> To follow are two patches. >>> >>> The first adds the timberdale video-in driver to the media tree. >>> >>> The second adds it to the timberdale MFD driver. >>> >>> Samuel and Mauro hope you can support and solve the potential merge >>> issue between your two trees. >> >> If the conflicts are trivial, I can handle when merging upstream. > Since the mfd part of this patchset has a build time dependency on the media > part, would you mind pushing both patches upstream through your tree ? > I'll ACK the mfd part. Sure. This is probably a way simpler than the reverse ;) 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
