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)
1  2 
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/r600/r700_chip.c

Simple merge