Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1