Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
authorIan Romanick <idr@us.ibm.com>
Fri, 31 Aug 2007 17:54:55 +0000 (10:54 -0700)
committerIan Romanick <idr@us.ibm.com>
Fri, 31 Aug 2007 17:54:55 +0000 (10:54 -0700)
commitfee49e2071f2f528d7041bf1f14c640fff7478cc
tree6e41210d9f98e02b6ef2129c1be105104334bef7
parentbb3da88601749cd647632eed86fb57dfd7cb81ee
parentbac3f49daa54bf34ea21854be23061d10a0d0d1b
Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
linux-core/Makefile.kernel
shared-core/drm_pciids.txt