OSDN Git Service

Merge tag libdrm-2.4.102 into q-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 4 Jun 2020 11:06:00 +0000 (19:06 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 4 Jun 2020 11:06:00 +0000 (19:06 +0800)
commit5d873d8680438bd5fa5c24c57929cda0fcfc8e51
tree2ea0dac2658bfbf615e774aa62a8d8770f31ebe1
parent26165425d40e74ac7ac6f83f99e7ea9db91aac47
parentbb70ab82fd599b0a0db3d22354f05ae87fbc4515
Merge tag libdrm-2.4.102 into q-x86

Conflicts:
Android.common.mk
include/drm/nouveau_drm.h
xf86drm.c
Android.bp
xf86drm.c
xf86drm.h