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

diff --cc drivers/gpu/drm/drm_crtc.c
Simple merge

diff --cc drivers/gpu/drm/drm_fb_helper.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
index 790fef3,0405a74..1258b11
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -221,11 -220,8 +221,13 @@@ enum no_fbc_reason 
        FBC_NOT_TILED, /* buffer not tiled */
  };
  
 +enum intel_pch {
 +      PCH_IBX,        /* Ibexpeak PCH */
 +      PCH_CPT,        /* Cougarpoint PCH */
 +};
 +
+ struct intel_fbdev;
+ 
  typedef struct drm_i915_private {
        struct drm_device *dev;
  

diff --cc drivers/gpu/drm/i915/i915_irq.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_fb.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drv.h
index ace630a,941339c..5b47b79
--- 1/drivers/gpu/drm/nouveau/nouveau_drv.h
--- 2/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@@ -533,8 -531,7 +533,9 @@@ struct drm_nouveau_private 
                atomic_t validate_sequence;
        } ttm;
  
 +      struct fb_info *fbdev_info;
 +
+       int fifo_alloc_count;
        struct nouveau_channel *fifos[NOUVEAU_MAX_CHANNEL_NR];
  
        struct nouveau_engine engine;

diff --cc drivers/gpu/drm/nouveau/nouveau_fbcon.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_irq.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_state.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nv50_display.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nv50_fbcon.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_connectors.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_device.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_fb.c
index 9ac57a0,d3ed4af..fcb5b52
--- 1/drivers/gpu/drm/radeon/radeon_fb.c
--- 2/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@@ -23,12 -23,7 +23,8 @@@
   * Authors:
   *     David Airlie
   */
-     /*
-      *  Modularization
-      */
- 
  #include <linux/module.h>
 +#include <linux/slab.h>
  #include <linux/fb.h>
  
  #include "drmP.h"

diff --cc include/drm/drm_crtc.h
Simple merge