[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Sat, 8 Aug 2009 10:46:33 +1000
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,
Joe Perches <joe@...ches.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Markus Heidelberg <markus.heidelberg@....de>
Subject: Re: linux-next: manual merge of the trivial tree with the tree
Hi Jiri,
On Sat, 8 Aug 2009 02:13:36 +0200 (CEST) Jiri Kosina <jkosina@...e.cz> wrote:
>
> [ sorry for late reply, have been on vacation, totally offline, for two
> weeks ]
Hey, no worries :-)
> I have fast-forwarded the 'for-next' branch of trivial tree and fixed the
> conflict, so it should be OK the next time you pull.
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