Merge branch 'gallium-format-cleanup'

diff --cc src/gallium/auxiliary/util/u_gen_mipmap.c
Simple merge

diff --cc src/gallium/drivers/i915/i915_state_emit.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_blit.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_state.c
Simple merge

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

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