projects / platform / upstream / libdrm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63c0f39 d0080d7)
Merge branch 'master' into crestline
authorKeith Packard <keithp@neko.keithp.com>
Mon, 8 Jan 2007 06:37:40 +0000 (22:37 -0800)
committerKeith Packard <keithp@neko.keithp.com>
Mon, 8 Jan 2007 06:37:40 +0000 (22:37 -0800)
Conflicts:

shared-core/i915_drm.h

Whitespace change only

1  2 
shared-core/drm_pciids.txt patch | diff1 | diff2 | blob | history
shared-core/i915_dma.c patch | diff1 | diff2 | blob | history

diff --cc shared-core/drm_pciids.txt
Simple merge
diff --cc shared-core/i915_dma.c
Simple merge
Domain: System / Kernel;