Merge remote branch 'origin/master' into pipe-video

Conflicts:
	src/gallium/auxiliary/Makefile
	src/gallium/auxiliary/SConscript

diff --cc configure.ac
Simple merge

diff --cc src/gallium/auxiliary/Makefile
index 07b3372c914f51756561baa01692f95609cf4087,53a0847f0320c87368fa83d41cbb05ebf0007f4a..bf90a704dd42a196d584a7f47978c9dee933d470
--- 1/src/gallium/auxiliary/Makefile
--- 2/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@@ -142,13 -142,14 +142,12 @@@ C_SOURCES = 
        util/u_tile.c \
        util/u_transfer.c \
        util/u_resource.c \
 -      util/u_upload_mgr.c
 -
 -      # Disabling until pipe-video branch gets merged in
 -      #vl/vl_bitstream_parser.c \
 -      #vl/vl_mpeg12_mc_renderer.c \
 -      #vl/vl_compositor.c \
 -      #vl/vl_csc.c \
 -      #vl/vl_shader_build.c \
 +      util/u_upload_mgr.c \
-       target-helpers/wrap_screen.c \
 +      vl/vl_bitstream_parser.c \
 +      vl/vl_mpeg12_mc_renderer.c \
 +      vl/vl_compositor.c \
 +      vl/vl_csc.c \
 +        vl/vl_idct.c
  
  GALLIVM_SOURCES = \
          gallivm/lp_bld_arit.c \
@@@ -222,3 -223,3 +221,4 @@@ util/u_format_table.c: util/u_format_ta
  
  util/u_half.c: util/u_half.py
        $(PYTHON2) util/u_half.py > $@
++# DO NOT DELETE

diff --cc src/gallium/drivers/nvfx/nvfx_screen.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_pipe.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_state.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_texture.c
Simple merge

diff --cc src/gallium/include/pipe/p_defines.h
Simple merge