Re: linux-next: manual merge of the omap_dss2 tree with the omaptree
From: Tony Lindgren
Date: Thu Feb 24 2011 - 16:23:53 EST
* Tomi Valkeinen <tomi.valkeinen@xxxxxx> [110221 00:46]:
> Tony, do you have such a semi-stable branch I could use as a base? Or
> any other ideas?
I guess you already figured this out.. The omap-for-linus branch should
have immutable commits. So you can merge with the earliest commit that
does the job for you from there.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/