projects / platform / upstream / libdrm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c5b91a a9f57a2)
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/drm into nouveau-1
authorStephane Marchesin <marchesin@icps.u-strasbg.fr>
Sat, 14 Oct 2006 22:12:13 +0000 (00:12 +0200)
committerStephane Marchesin <marchesin@icps.u-strasbg.fr>
Sat, 14 Oct 2006 22:12:13 +0000 (00:12 +0200)
1  2 
linux-core/Makefile patch | diff1 | diff2 | blob | history
shared-core/drm_pciids.txt patch | diff1 | diff2 | blob | history

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