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)
1  2 
linux-core/Makefile.kernel
shared-core/drm_pciids.txt

Simple merge
Simple merge