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