| commit | 870942e56aac024da5e0a621275f6561a4ddab1b | [log] [tgz] |
|---|---|---|
| author | Sean Paul <seanpaul@chromium.org> | Wed Feb 03 10:52:15 2016 -0500 |
| committer | Sean Paul <seanpaul@chromium.org> | Wed Feb 03 10:52:15 2016 -0500 |
| tree | f50e065f5088a40e2a34ae83e2e3ff6ab2e6f625 | |
| parent | bd4d0d244019a72be9ca51ac3e8f35201b271f1b [diff] | |
| parent | b38a4b2326c1be5702f5cb73a53c0ed74c12d510 [diff] |
Merge tag 'tags/libdrm-2.4.66' into master Tag libdrm-2.4.66 from git://anongit.freedesktop.org/mesa/drm Signed-off-by: Sean Paul <seanpaul@chromium.org> Conflicts: Android.mk Makefile.am configure.ac freedreno/Android.mk include/drm/drm_mode.h intel/Android.mk libkms/Android.mk nouveau/Android.mk radeon/Android.mk tegra/tegra.c tests/Makefile.am xf86drmMode.c xf86drmMode.h Change-Id: I3186bde7f196d2f3438c4334591ee2a0c1371c96