r600g: some merge fixes
authorChristian König <deathsimple@vodafone.de>
Sun, 9 Jan 2011 12:18:30 +0000 (13:18 +0100)
committerChristian König <deathsimple@vodafone.de>
Sun, 9 Jan 2011 12:18:30 +0000 (13:18 +0100)
commit9bf8adc45e1b90b33e3900eef3a682a263b9e1bb
tree64e0b9c974cf24aacadcd6e2e21f4c5b90d2d770
parent72e30991559017c16d48569e612dbc0970e3b9ca
r600g: some merge fixes
src/gallium/drivers/r600/r600_asm.c