Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

From: Stephen Rothwell
Date: Thu Sep 03 2009 - 02:49:17 EST

Hi Mauro,

On Wed, 2 Sep 2009 23:12:14 -0300 Mauro Carvalho Chehab <maurochehab@xxxxxxxxx> wrote:
> I've rebased it to fix this merge conflict between my devel tree and upstream.
> You probably can drop it on your next merge.


Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature