Today's linux-next merge of the omap_dss2 tree got conflicts in drivers/video/omap2/dss/hdmi4_core.c drivers/video/omap2/dss/hdmi4_core.h caused by commits ef26958 (omapdss: HDMI: Rename hdmi driver files to nicer names) and a few others that I didn't quite track down. But given that the diff of the merge commit is empty I guess everything's well. Thanks, Thierry -- 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
