Hacks 2

Conflicts:
	src/mesa/drivers/dri/intel/intel_mipmap_tree.c
More hacks