Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
authorIan Romanick <idr@us.ibm.com>
Thu, 26 Jul 2007 23:58:28 +0000 (16:58 -0700)
committerIan Romanick <idr@us.ibm.com>
Thu, 26 Jul 2007 23:58:28 +0000 (16:58 -0700)
commitc561cb4650dc5895acfb3ae00c7ff455be31a860
tree65b21097253d216e0385778597031ae288e34023
parent2bafeb673f14b1e3799bf00817138c0b8211635e
parent4175dd818110bd10d6d09190d30c271e89202b18
Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2

Conflicts:

linux-core/drmP.h
linux-core/drm_scatter.c
linux-core/Makefile.kernel