Merge branch 'master' into bo-set-pin

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

diff --cc linux-core/drm_drv.c
index 816b8a2,bb15987..cedb6d5
--- 1/linux-core/drm_drv.c
--- 2/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@@ -648,10 -653,10 +654,10 @@@ long drm_unlocked_ioctl(struct file *fi
  err_i1:
        atomic_dec(&dev->ioctl_count);
        if (retcode)
 -              DRM_DEBUG("ret = %x\n", retcode);
 +              DRM_DEBUG("ret = %d\n", retcode);
        return retcode;
  }
- EXPORT_SYMBOL(drm_ioctl);
+ EXPORT_SYMBOL(drm_unlocked_ioctl);
  
  drm_local_map_t *drm_getsarea(struct drm_device *dev)
  {

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