r600g: merge fix
authorChristian König <deathsimple@vodafone.de>
Wed, 2 Mar 2011 19:48:03 +0000 (20:48 +0100)
committerChristian König <deathsimple@vodafone.de>
Wed, 2 Mar 2011 19:48:03 +0000 (20:48 +0100)
commited12c29bc45b100b758c9affe2cebe8c8498e25e
treeea07cf261c4f3dce553cac46503f217cf7bdc55b
parentb97e41c7b18c363a303693fb841fe606b1106fe6
r600g: merge fix
src/gallium/drivers/r600/r600_asm.c