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

Next message: Wu Fengguang: "Re: [PATCH][RESEND] tcp: replace hard coded GFP_KERNEL withsk_allocation"
Previous message: Ingo Molnar: "Re: [tip:perfcounters/core] perf_counter: Introduce new(non-)paranoia level to allow raw tracepoint access"
In reply to: Mauro Carvalho Chehab: "Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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.

Thanks.

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

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Wu Fengguang: "Re: [PATCH][RESEND] tcp: replace hard coded GFP_KERNEL withsk_allocation"
Previous message: Ingo Molnar: "Re: [tip:perfcounters/core] perf_counter: Introduce new(non-)paranoia level to allow raw tracepoint access"
In reply to: Mauro Carvalho Chehab: "Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]