[xorg-x11-drv-nvidia/f25] (4 commits) ...fix merge