[nvidia-kmod/f25] (3 commits) ...fix merge