linux-next: manual merge of the driver-core tree with the omap_dss2 tree

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:

linux-next: manual merge of the driver-core tree with the omap_dss2 tree

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