[xorg-x11-drv-nvidia/el7] (105 commits) ...fix merge