Merge remote-tracking branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Thu, 9 Jun 2011 07:35:09 +0000 (09:35 +0200)
committerChristian König <deathsimple@vodafone.de>
Thu, 9 Jun 2011 07:35:09 +0000 (09:35 +0200)
commit003401f95c9b59471c22368b7da16fe7a951e490
treed21fa0197ff27b8a38bd8b1d795b74d816db8b26
parent00b4e48560f4d576b7b1924257322f5167e58c8d
parentd302804debeed13ced27fce222110c629e55d6f9
Merge remote-tracking branch 'origin/master' into pipe-video

Conflicts:
src/gallium/tests/unit/u_format_test.c
src/gallium/winsys/r600/drm/r600_hw_context.c
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/drivers/r300/Makefile
src/gallium/drivers/r300/r300_screen.c
src/gallium/drivers/r600/r600_state.c
src/gallium/drivers/softpipe/sp_screen.c
src/gallium/winsys/r600/drm/r600_bo.c
src/gallium/winsys/r600/drm/r600_hw_context.c