Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next

bunch of cleanups
* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
  drm: mark drm_context support as legacy
  drm: make sysfs device always available for minors
  drm: make minor->index available early
  drm: merge drm_drv.c into drm_ioctl.c
  drm: move module initialization to drm_stub.c
  drm: don't de-authenticate clients on master-close
  drm: drop redundant drm_file->is_master
  drm: extract legacy ctxbitmap flushing

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

diff --cc drivers/gpu/drm/drm_fops.c
index 8f91062,ed45ee6..4b06094
--- 1/drivers/gpu/drm/drm_fops.c
--- 2/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@@ -519,9 -449,12 +453,8 @@@ int drm_release(struct inode *inode, st
        /* drop the master reference held by the file priv */
        if (file_priv->master)
                drm_master_put(&file_priv->master);
-       file_priv->is_master = 0;
        mutex_unlock(&dev->master_mutex);
  
 -      mutex_lock(&dev->struct_mutex);
 -      list_del(&file_priv->lhead);
 -      mutex_unlock(&dev->struct_mutex);
 -
        if (dev->driver->postclose)
                dev->driver->postclose(dev, file_priv);