projects / platform / upstream / libdrm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1bc147 62cdc6d)
Merge branch 'master' into modesetting-101
authorDave Airlie <airlied@linux.ie>
Thu, 15 Nov 2007 04:04:19 +0000 (15:04 +1100)
committerDave Airlie <airlied@linux.ie>
Thu, 15 Nov 2007 04:04:19 +0000 (15:04 +1100)
Conflicts:

shared-core/i915_dma.c
tests/ttmtest/src/ttmtest.c

1  2 
linux-core/drmP.h patch | diff1 | diff2 | blob | history
linux-core/i915_drv.c patch | diff1 | diff2 | blob | history

diff --cc linux-core/drmP.h
Simple merge
diff --cc linux-core/i915_drv.c
Simple merge
Domain: System / Kernel;