On Mon, 2009-11-16 at 06:04 +0100, ext Stephen Rothwell wrote: > Hi Tomi, > > Today's linux-next merge of the omap_dss2 tree got a conflict in > arch/arm/configs/omap_3430sdp_defconfig between the omap tree and the > omap_dss2 tree. > > I just used the version from the omap tree as I can't figure out anything > better, sorry. Tony, These patches in omap tree seem to cause the conflicts. Are they stable, ie. can I cherry pick them to my for-next tree, and put my patches on top of them? b30dcf5f37023d591caee80c233bf33706bc5a21 omap3: 3430sdp: Enable Linux Regulator framework fc89f86e06c11b8828ce1d6c669f724877546c03 ARM: OMAP3: Fix 3430SDP defconfig Tomi -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
