Merge branch 'master' of ../../drm into modesetting-101

Conflicts:

	linux-core/drmP.h
	linux-core/drm_drv.c
	linux-core/drm_proc.c
	linux-core/drm_stub.c
	linux-core/drm_sysfs.c

diff --cc linux-core/drmP.h
index 1a0a565,1fea807..4797485
--- 1/linux-core/drmP.h
--- 2/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@@ -761,9 -721,8 +761,10 @@@ struct drm_driver 
  };
  
  #define DRM_MINOR_UNASSIGNED 0
- #define DRM_MINOR_CONTROL 1
- #define DRM_MINOR_LEGACY 2
+ #define DRM_MINOR_LEGACY 1
++#define DRM_MINOR_CONTROL 2
 +#define DRM_MINOR_RENDER 3
+ 
  /**
   * DRM minor structure. This structure represents a drm minor number.
   */

diff --cc linux-core/drm_bo.c
Simple merge

diff --cc linux-core/drm_objects.h
Simple merge

diff --cc linux-core/drm_stub.c
index 6856075,6584f51..ba13e5e
--- 1/linux-core/drm_stub.c
--- 2/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@@ -344,17 -285,13 +344,21 @@@ int drm_get_dev(struct pci_dev *pdev, c
        }
  
        /* only add the control node on a modesetting platform */
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              if ((ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL)))
 +                      goto err_g3;
 +
        if ((ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY)))
 -              goto err_g3;
 +              goto err_g4;
 +
 +      if (dev->driver->load)
 +              if ((ret = dev->driver->load(dev, ent->driver_data)))
 +                      goto err_g5;
  
+       if (dev->driver->load)
+               if ((ret = dev->driver->load(dev, ent->driver_data)))
+                       goto err_g4;
+ 
        DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
                 driver->name, driver->major, driver->minor, driver->patchlevel,
                 driver->date, dev->primary->index);

diff --cc shared-core/i915_dma.c
Simple merge