diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-04-20 05:16:04 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-20 05:16:04 +0200 |
| commit | 7fff400be6fbf64f10abca9939718aaf1d61c255 (patch) | |
| tree | 384118628f5c5aa2d74303cddd120de75308beea /drivers/macintosh | |
| parent | Merge branch 'drm-radeon-lockup' into drm-core-next (diff) | |
| parent | drm/fb: remove drm_fb_helper_setcolreg (diff) | |
| download | linux-7fff400be6fbf64f10abca9939718aaf1d61c255.tar.xz linux-7fff400be6fbf64f10abca9939718aaf1d61c255.zip | |
Merge branch 'drm-fbdev-cleanup' into drm-core-next
* drm-fbdev-cleanup:
drm/fb: remove drm_fb_helper_setcolreg
drm/kms/fb: use slow work mechanism for normal hotplug also.
drm/kms/fb: add polling support for when nothing is connected.
drm/kms/fb: provide a 1024x768 fbcon if no outputs found.
drm/kms/fb: separate fbdev connector list from core drm connectors
drm/kms/fb: move to using fb helper crtc grouping instead of core crtc list
drm/fb: fix fbdev object model + cleanup properly.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
Diffstat (limited to 'drivers/macintosh')
0 files changed, 0 insertions, 0 deletions