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

From: Stephen Rothwell
Date: Tue May 11 2010 - 20:23:26 EST

Next message: KOSAKI Motohiro: "Re: [PATCH] mm,migration: Avoid race between shift_arg_pages() and rmap_walk() during migration by not migrating temporary stacks"
Previous message: Lars-Peter Clausen: "[PATCH 4/4] MFD: pcf50633: Move irq related functions to its own file."
In reply to: Mauro Carvalho Chehab: "Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree"
Next in thread: Stephen Rothwell: "linux-next: manual merge of the v4l-dvb tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Mauro,

On Tue, 11 May 2010 20:23:08 -0300 Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> wrote:
>
> Conflicts solved. They were generated by an upstream merge from
> my fixes tree.

Thanks.

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

Attachment: pgp00000.pgp
Description: PGP signature

Next message: KOSAKI Motohiro: "Re: [PATCH] mm,migration: Avoid race between shift_arg_pages() and rmap_walk() during migration by not migrating temporary stacks"
Previous message: Lars-Peter Clausen: "[PATCH 4/4] MFD: pcf50633: Move irq related functions to its own file."
In reply to: Mauro Carvalho Chehab: "Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree"
Next in thread: Stephen Rothwell: "linux-next: manual merge of the v4l-dvb tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]