Subject: linux-next: manual merge of the omap_dss2 tree

From: Thierry Reding <[email-masked]>
Date: Mon, 14 Oct 2013 16:48:06 +0200

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