linux-next: manual merge of the drm tree with Linus' tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/atombios_encoders.c between commit c23632d4e57c
("Alex Deucher <alexander.deucher@xxxxxxx>") from Linus' tree and commit
43a340262ad4 ("drm/radeon/atom: don't call [EN|DIS]ABLE_OUTPUT on
DCE3.x") from the drm tree.

I fixed it up (just using the latter version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature