linux-next: manual merge of the staging tree with the drm tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/imx-drm/imx-hdmi.c, drivers/staging/imx-drm/imx-ldb.c,
drivers/staging/imx-drm/imx-tve.c and
drivers/staging/imx-drm/parallel-display.c between commits 69fa5293bf8d
("drm/kms: rip out drm_mode_connector_detach_encoder") and fc1645ac826c
("drm/imx: remove drm_mode_connector_detach_encoder harder") from the drm
tree and commit 1b3f76756633 ("imx-drm: initialise drm components
directly") from the staging tree.

I fixed it up (I used the staging tree version as it was a superset of
the drm tree version) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpDDe6xNAS7I.pgp
Description: PGP signature