Merge commit 'origin/master' into drm-gem

diff --cc src/mesa/drivers/dri/i915/Makefile
index ccba34d229398cf05ee5a799c99b76ee54774c05,bdd3b852603696a25c138c5f8a35cc190e71a95f..fd77980ebf8c4bcf1bbaa593498ba850478ab579
--- 1/src/mesa/drivers/dri/i915/Makefile
--- 2/src/mesa/drivers/dri/i915/Makefile
+++ b/src/mesa/drivers/dri/i915/Makefile
@@@ -27,7 -27,11 +27,11 @@@ DRIVER_SOURCES = 
        intel_tex_validate.c \
        intel_tex_format.c \
        intel_tex.c \
+       intel_pixel.c \
+       intel_pixel_bitmap.c \
        intel_pixel_copy.c \
 -      intel_pixel_read.c \
+       intel_pixel_draw.c \
++      intel_pixel_read.c \
        intel_buffers.c \
        intel_blit.c \
        i915_tex.c \

diff --cc src/mesa/drivers/dri/i915/i830_context.c
Simple merge

diff --cc src/mesa/drivers/dri/i915/i915_context.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/Makefile
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_blit.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_context.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_context.h
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_pixel_draw.c
Simple merge