Messages in this thread | | | Date | Sat, 8 Aug 2009 10:46:33 +1000 | From | Stephen Rothwell <> | 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@suse.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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |