Merge remote branch 'korg/drm-radeon-dp' into drm-linus
authorDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 04:29:15 +0000 (14:29 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 04:29:15 +0000 (14:29 +1000)
commit7b0a9e8302522d5f7bb7fab6b8a3c8ce8181609c
treec958236a2397b3e5be77d99a494673764341e737
parent3f838fc50c0dcdc993c24f6f5da0cda1228fc276
parentd4877cf2293f5463f531769fd12300cb3417c778
Merge remote branch 'korg/drm-radeon-dp' into drm-linus

This merges the radeon KMS DisplayPort and hotplug detect support.

Tested on RV635 DP card with a Dell 2408 monitor.

Conflicts:
drivers/gpu/drm/drm_fb_helper.c