Merge commit 'origin/master' into gallium-sampler-view

This branch already seems to have the nv50_tex.c fix.

Conflicts:
	src/gallium/drivers/nv50/nv50_tex.c

diff --cc src/gallium/drivers/llvmpipe/lp_state.h
Simple merge

diff --cc src/gallium/drivers/llvmpipe/lp_state_fs.c
Simple merge

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

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

diff --cc src/mesa/state_tracker/st_context.h
Simple merge