projects / platform / upstream / libdrm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e79e2a5 a27af4c)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorAlan Hourihane <alanh@fairlite.demon.co.uk>
Fri, 29 Jun 2007 19:09:44 +0000 (20:09 +0100)
committerAlan Hourihane <alanh@fairlite.demon.co.uk>
Fri, 29 Jun 2007 19:09:44 +0000 (20:09 +0100)
commit8a78dead291ffdb5a8774419cdca369a1e27cad9
tree399b8378e32036bdc7dadc10c639465a8fb21681tree | snapshot
parente79e2a58161d44754fd55507e155b7e12a09c4d2commit | diff
parenta27af4c4a665864df09123f177ca7269e48f6171commit | diff
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

linux-core/drm_drv.c
linux-core/drm_fops.c
linux-core/drm_objects.h
linux-core/drm_stub.c
shared-core/i915_dma.c
15 files changed:
linux-core/Makefile.kernel diff1 | diff2 | blob | history
linux-core/drmP.h diff1 | diff2 | blob | history
linux-core/drm_bo.c diff1 | diff2 | blob | history
linux-core/drm_bo_move.c diff1 | diff2 | blob | history
linux-core/drm_bufs.c diff1 | diff2 | blob | history
linux-core/drm_compat.h diff1 | diff2 | blob | history
linux-core/drm_drv.c diff1 | diff2 | blob | history
linux-core/drm_fops.c diff1 | diff2 | blob | history
linux-core/drm_objects.h diff1 | diff2 | blob | history
linux-core/drm_stub.c diff1 | diff2 | blob | history
linux-core/i915_drv.c diff1 | diff2 | blob | history
shared-core/i915_dma.c diff1 | diff2 | blob | history
shared-core/i915_drv.h diff1 | diff2 | blob | history
shared-core/i915_init.c diff1 | | blob | history
shared-core/i915_irq.c diff1 | diff2 | blob | history
Domain: System / Kernel;