Merge tag libdrm-2.4.100 into q-x86

Conflicts:
	Makefile.am
	configure.ac
	tests/Makefile.am
	xf86drm.c

diff --cc intel/intel_chipset.c
Simple merge

diff --cc intel/intel_chipset.h
Simple merge

diff --cc xf86drm.c
index e439903,b7d5865..be70085
--- 1/xf86drm.c
--- 2/xf86drm.c
+++ b/xf86drm.c
@@@ -71,20 -71,6 +71,10 @@@
  
  #include "util_math.h"
  
- #ifdef __OpenBSD__
- #define DRM_PRIMARY_MINOR_NAME  "drm"
- #define DRM_CONTROL_MINOR_NAME  "drmC"
- #define DRM_RENDER_MINOR_NAME   "drmR"
- #else
- #define DRM_PRIMARY_MINOR_NAME  "card"
- #define DRM_CONTROL_MINOR_NAME  "controlD"
- #define DRM_RENDER_MINOR_NAME   "renderD"
- #endif
- 
 +#ifdef __ANDROID__
 +#include <log/log.h>
 +#endif
 +
  #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  #define DRM_MAJOR 145
  #endif

diff --cc xf86drm.h
Simple merge