projects / platform / upstream / libdrm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 90d8f79 5766d81)
Merge branch 'master' into modesetting-101
authorJesse Barnes <jesse.barnes@intel.com>
Thu, 1 Nov 2007 22:27:55 +0000 (15:27 -0700)
committerJesse Barnes <jesse.barnes@intel.com>
Thu, 1 Nov 2007 22:27:55 +0000 (15:27 -0700)
commit629c8b0dbf975632473d848f60606baf309f2f3b
tree9b85064c2673527cb7515af7e356bb47aaa4639ftree | snapshot
parent90d8f792794d46d1a8e998856bc7bbe54596114bcommit | diff
parent5766d81074d6faa7f14b45635765cdb7209597fccommit | diff
Merge branch 'master' into modesetting-101

Conflicts:

linux-core/Makefile.kernel
linux-core/drm_stub.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h

Fixup suspend/resume conflicts (basically use what's in DRM master for now).
Also fix up a few other conflicts that snuck in (i915_dma changes etc.).
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_drv.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_buffer.c diff1 | diff2 | blob | history
linux-core/i915_drv.c diff1 | diff2 | blob | history
shared-core/drm.h diff1 | diff2 | blob | history
shared-core/i915_dma.c diff1 | diff2 | blob | history
shared-core/i915_drv.h diff1 | diff2 | blob | history
Domain: System / Kernel;