Merge remote branch 'origin/mesa_7_7_branch'
authorDave Airlie <airlied@itt42.(none)>
Fri, 20 Nov 2009 01:48:10 +0000 (11:48 +1000)
committerDave Airlie <airlied@itt42.(none)>
Fri, 20 Nov 2009 01:48:10 +0000 (11:48 +1000)
commit3f2c77659ca552c43f544228f3a5a5fe6365513a
treef98f22ac8a1dbcaa9c457d8f64731c6d4a374cdb
parentb09e74901a4f92299fe3f52f57d27fd5ca5bdd2d
parentf8ea5318200c1ed839fc387b16a57c8d9969974b
Merge remote branch 'origin/mesa_7_7_branch'
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/r600/r700_chip.c