On Wed, Mar 05, 2014 at 02:13:15PM +0100, Daniel Vetter wrote: > Just to double check: Have I merged the right version? No conflicts or residual with my tree, so yes. -Chris -- Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx