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)
commit93fee5cf222ad6d97e0dcb85e13a8d8b84dba81f
tree4e62581041c93f6ab51e6cafd804e81b5172040f
parent2c5b91aecf3d21684ffca758c034cd9a8ed2155d
parenta9f57a2b9c5897cbf568bf75342204b780566de0
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/drm into nouveau-1
linux-core/Makefile
shared-core/drm_pciids.txt