feb619b770
Conflicts: src/mesa/drivers/dri/intel/intel_mipmap_tree.c - left what was in master
Conflicts: src/mesa/drivers/dri/intel/intel_mipmap_tree.c - left what was in master