Merge remote branch 'nouveau/gallium-0.1' into gallium-0.2
[mesa.git] / src / mesa / drivers / dri / i915 / server / intel_dri.c
1 ../../intel/server/intel_dri.c