Messages in this thread | | | Date | Thu, 3 Sep 2009 16:49:03 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree |
| |
Hi Mauro,
On Wed, 2 Sep 2009 23:12:14 -0300 Mauro Carvalho Chehab <maurochehab@gmail.com> 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.
Thanks.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |