tree 384118628f5c5aa2d74303cddd120de75308beea
parent 0bcb1d844ac638a4c4280f697d5bfac9791e9a70
parent b1f201980eb4a7a59277a13cf18acdbb46167ad5
author Dave Airlie <airlied@redhat.com> 1271733364 +1000
committer Dave Airlie <airlied@redhat.com> 1271733364 +1000

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