On Thursday 08 of March 2012 16:51:16 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-omap1/board-ams-delta.c between commit ddba6c7f7ec6 > ("OMAP1: pass LCD config with omapfb_set_lcd_config()") from the > omap_dss2 tree and commits 5ca6180fa6d7 ("ARM: OMAP1: ams-delta: > supersede custom led device by leds-gpio") and 2e3ee9f45b3c ("ARM: OMAP1: > Move most of plat/io.h into local iomap.h") from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary. Hi, Your resolution looks good to me, thanks! Janusz -- 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