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

[Stephen Rothwell]

Hi Mauro,

On Fri, 09 Apr 2010 02:22:29 -0300 Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> wrote:
>
> Thanks for pointing it to me. Fixed.
> 
> I also fixed today a conflict that it would appear on your next pull, between 
> input and v4l-dvb, due to the upstream changes of keytable ops from
> int to unsigned.

Excellent, thanks.

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

Attachment: pgp00000.pgp
Description: PGP signature