Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

	linux-core/drm_sysfs.c

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

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

diff --cc linux-core/drm_sysfs.c
index f03e5d4,c02e204..3372a71
--- 1/linux-core/drm_sysfs.c
--- 2/linux-core/drm_sysfs.c
+++ b/linux-core/drm_sysfs.c
@@@ -36,9 -35,8 +36,9 @@@ static int drm_sysfs_suspend(struct dev
  
        printk(KERN_ERR "%s\n", __FUNCTION__);
  
 -      if (drm_dev->driver->suspend)
 -              return drm_dev->driver->suspend(drm_dev, state);
 +      if (drm_minor->type == DRM_MINOR_CONTROL)
 +              if (drm_dev->driver->suspend)
-                       return drm_dev->driver->suspend(drm_dev);
++                      return drm_dev->driver->suspend(drm_dev, state);
  
        return 0;
  }

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