Merge branch 'master' into drm-gem

Conflicts:

	src/mesa/drivers/dri/common/dri_bufmgr.c
	src/mesa/drivers/dri/i965/brw_wm_surface_state.c

diff --cc src/mesa/drivers/dri/Makefile.template
Simple merge

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/brw_clip_state.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_context.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_defines.h
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_misc_state.c
Simple merge

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

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

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

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

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

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

diff --cc src/mesa/main/fbobject.c
Simple merge