| author | Jesse Barnes <jbarnes@virtuousgeek.org> | |
| Thu, 3 Dec 2009 22:17:26 +0000 (14:17 -0800) | ||
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | |
| Thu, 3 Dec 2009 22:17:26 +0000 (14:17 -0800) | ||
| commit | 53addc5d6ef7406d9fab5ea481cf68fa011870f1 | |
| tree | eb43991923600b5751e04539438e5fffebb61cb3 | tree | snapshot (tar.xz tar.gz zip) |
| parent | db50f5127421ac8f4e3ce4eb7c27d27475781488 | commit | diff |
| parent | ee746a83cecd99d4c380fbc5d391399a6d9fde9e | commit | diff |
Merge branch 'pageflip' of git://people.freedesktop.org/~jbarnes/drm
Conflicts:
include/drm/drm.h - RMFB had its signature changed to avoid uint32_t
Conflicts:
include/drm/drm.h - RMFB had its signature changed to avoid uint32_t
| include/drm/drm.h | diff1 | | diff2 | | blob | history |
| include/drm/drm_mode.h | diff1 | | diff2 | | blob | history |
| include/drm/i915_drm.h | diff1 | | diff2 | | blob | history |
| xf86drm.h | diff1 | | diff2 | | blob | history |
| xf86drmMode.c | diff1 | | diff2 | | blob | history |
| xf86drmMode.h | diff1 | | diff2 | | blob | history |