Re: linux-next: manual merge of the omap_dss2 tree with the omap tree
From
Tomi Valkeinen <>
Date
Tue, 17 Nov 2009 12:00:31 +0200
On Mon, 2009-11-16 at 19:34 +0100, ext Tony Lindgren wrote: > Tomi, please update your patch by leaving out the now unnecessary > TWL4030 and regulator sections. See also the updated version of > your patch attached.
Thanks, updated. Now I'm able to merge linux-omap/for-next and dss/for-next without conflicts.