[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20090903164903.0d9043d1.sfr@canb.auug.org.au>
Date: Thu, 3 Sep 2009 16:49:03 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Mauro Carvalho Chehab <maurochehab@...il.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Randy Dunlap <randy.dunlap@...cle.com>
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@...il.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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists