Re: linux-next: v4l-dvb merge conflicts (Re: linux-next: upstreambuild failure: v4l/dvb)

[Stephen Rothwell]

Hi Mauro,

On Wed, 30 Apr 2008 16:12:24 -0300 Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> wrote:
> 
> Anyway, I've already dropped those patches that were already applied from my
> tree. You should get a clean merge tomorrow.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature