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

Stephen Rothwell
2013-11-07T02:21:14Z

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/radeon_connectors.c between commit 108dc8e8b44a
("drm/radeon: rework audio option") from Linus' tree and commit
ad41550666f8 ("drm/radeon: enable hdmi audio by default") from the drm
tree.

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

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]