[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20091201065511.37da12f1.sfr@canb.auug.org.au>
Date: Tue, 1 Dec 2009 06:55:11 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jkosina@...e.cz>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Ben Hutchings <bhutchings@...arflare.com>,
"David S. Miller" <davem@...emloft.net>,
"André Goddard Rosa" <andre.goddard@...il.com>
Subject: Re: linux-next: manual merge of the trivial tree with the net tree
Hi Jiri,
On Mon, 30 Nov 2009 13:36:18 +0100 (CET) Jiri Kosina <jkosina@...e.cz> wrote:
>
> Dropped the falcon.c hunk from the pile, so the conflict should be gone.
Thanks for that.
--
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