Messages in this thread | | | Date | Fri, 9 Apr 2010 17:13:33 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree |
| |
Hi Mauro,
On Fri, 09 Apr 2010 02:22:29 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |