Merge commit 'origin/master' into gallium-sampler-view
authorKeith Whitwell <keithw@vmware.com>
Mon, 15 Mar 2010 09:44:52 +0000 (09:44 +0000)
committerKeith Whitwell <keithw@vmware.com>
Mon, 15 Mar 2010 09:44:52 +0000 (09:44 +0000)
commit42910ebe7b9748c0ecb6a597bae3e7d43c7e170f
treeb2b9c72dc47a0473304dc2db1b078d13b658df34
parent47bfbd452c93e6a8db013fb90d9f42210cf24889
parent68e58a96e80865878e6881dc4d34fcc3ec24eb19
Merge commit 'origin/master' into gallium-sampler-view

Conflicts:
src/gallium/drivers/nv30/nv30_context.h
src/gallium/drivers/nv30/nv30_state.c
src/gallium/drivers/nv40/nv40_context.h
src/gallium/drivers/nv40/nv40_state.c
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/nv40/nv40_transfer.c
src/gallium/drivers/nvfx/nvfx_context.h
src/gallium/drivers/nvfx/nvfx_state.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c