Merge branch 'gallium-embedded'

diff --cc src/gallium/auxiliary/draw/draw_pipe_aaline.c
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_pipe_pstipple.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_ureg.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_ureg.h
Simple merge

diff --cc src/gallium/drivers/svga/svga_context.c
Simple merge

diff --cc src/gallium/drivers/svga/svga_state_fs.c
Simple merge

diff --cc src/gallium/state_trackers/vega/shaders_cache.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_bitmap.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_drawpixels.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_strings.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_texture.c
Simple merge

diff --cc src/mesa/state_tracker/st_framebuffer.c
Simple merge