Merge branch 'master' into modesetting-gem

Conflicts:

	libdrm/Makefile.am
	libdrm/xf86drm.h
	shared-core/i915_dma.c
	shared-core/i915_irq.c

diff --cc libdrm/Makefile.am
index 624f6ff,b73cb67..c6d6673
--- 1/libdrm/Makefile.am
--- 2/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@@ -26,10 -26,10 +26,10 @@@ libdrm_la_LDFLAGS = -version-number 2:3
  
  AM_CFLAGS = -I$(top_srcdir)/shared-core
  libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
-       xf86drmMode.c dri_bufmgr.c
 -      dri_bufmgr.c libdrm_lists.h
++      xf86drmMode.c dri_bufmgr.c libdrm_lists.h
  libdrm_la_LIBADD = intel/libdrm_intel.la
  
  libdrmincludedir = ${includedir}
- libdrminclude_HEADERS = xf86drm.h xf86mm.h xf86drmMode.h dri_bufmgr.h
 -libdrminclude_HEADERS = xf86drm.h dri_bufmgr.h
++libdrminclude_HEADERS = xf86drm.h xf86drmMode.h dri_bufmgr.h
  
  EXTRA_DIST = ChangeLog TODO

diff --cc libdrm/dri_bufmgr.h
Simple merge

diff --cc libdrm/intel/intel_bufmgr_gem.c
Simple merge

diff --cc libdrm/xf86drm.c
Simple merge

diff --cc libdrm/xf86drm.h
index b29b3e5,f4fa71b..584d2a4
--- 1/libdrm/xf86drm.h
--- 2/libdrm/xf86drm.h
+++ b/libdrm/xf86drm.h
@@@ -661,9 -659,4 +661,7 @@@ extern int drmOpenOnce(void *unused, co
  extern void drmCloseOnce(int fd);
  extern void drmMsg(const char *format, ...);
  
- #include "xf86mm.h"
- 
 +extern int drmSetMaster(int fd);
 +extern int drmDropMaster(int fd);
 +
  #endif

diff --cc linux-core/Makefile
Simple merge

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

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

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

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