Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Fri, 21 Jan 2011 20:51:24 +0000 (21:51 +0100)
committerChristian König <deathsimple@vodafone.de>
Fri, 21 Jan 2011 20:51:24 +0000 (21:51 +0100)
commit86e5b79a274ad4ed5c169aa5626106331273311c
tree31bc98df0e79c453c5ff143ac8e6ddaa846799c1
parent78faf8d0e9c276a0ff1465e501d58fb3d66de2f7
parent8af583f6e844ef2d173eb3c5c2e378cd1da018a8
Merge remote branch 'origin/master' into pipe-video

Conflicts:
src/gallium/drivers/r600/r600_texture.c
src/gallium/drivers/r600/r600_asm.c