Hi Greg,

Today's linux-next merge of the driver-core tree got conflicts in
sound/soc/omap/omap-hdmi-card.c and sound/soc/omap/omap-hdmi.c between
commit ab387c1e51d7 ("ASoC: omap: Remove obsolete HDMI audio code and
Kconfig options") from the omap_dss2 tree and commit d34135b4c0ef
("ASoC: omap: drop owner assignment from platform_drivers") from the
driver-core tree.

I fixed it up (I removed the files) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au