From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Apr 2010 03:16:04 +0000 (+1000)
Subject: Merge branch 'drm-fbdev-cleanup' into drm-core-next
X-Git-Tag: v2.6.35-rc1~451^2~87
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fff400be6fbf64f10abca9939718aaf1d61c255;p=pandora-kernel.git

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
---

7fff400be6fbf64f10abca9939718aaf1d61c255
Reading git-diff-tree failed