Merge branch 'master' into r500test
authorDave Airlie <airlied@linux.ie>
Wed, 16 Apr 2008 10:25:08 +0000 (20:25 +1000)
committerDave Airlie <airlied@linux.ie>
Wed, 16 Apr 2008 10:25:08 +0000 (20:25 +1000)
commit09df5eaff2ba2694b82d1211fd24410cb2997e25
tree0028ffd43d1895bb9e7d1ab0f5906629b0fa4825
parent9566cf0e2f326d8fe638748d0bc10626e8c0387e
parentb64448b3e4026d3f11f366515b7544a6581403f3
Merge branch 'master' into r500test

Conflicts:

src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_reg.h
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/radeon/radeon_chipset.h
src/mesa/drivers/dri/radeon/radeon_screen.c