Merge branch 'modesetting-dirty-libdrm'

Conflicts:
	include/drm/drm.h

diff --cc include/drm/drm.h
index 5408c08,225ab6c..4822159
--- 1/include/drm/drm.h
--- 2/include/drm/drm.h
+++ b/include/drm/drm.h
@@@ -696,10 -696,8 +696,11 @@@ struct drm_gem_open 
  #define DRM_IOCTL_MODE_GETFB          DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
  #define DRM_IOCTL_MODE_ADDFB          DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
  #define DRM_IOCTL_MODE_RMFB           DRM_IOWR(0xAF, unsigned int)
 +#define DRM_IOCTL_MODE_PAGE_FLIP      DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip)
+ #define DRM_IOCTL_MODE_DIRTYFB                DRM_IOWR(0xB1, struct drm_mode_fb_dirty_cmd)
  
 +/*@}*/
 +
  /**
   * Device specific ioctls should only be in their respective headers
   * The device specific ioctl range is from 0x40 to 0x99.

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

diff --cc xf86drmMode.c
Simple merge

diff --cc xf86drmMode.h
Simple merge