[xorg-x11-drv-nvidia/f24] (3 commits) ...fix merge
Summary of changes:
76b80a1... Revert "Update to 370.23 beta" (*)
968ad10... Merge branch 'f25' into f23 (*)
7b1b322... fix merge (*)
(*) This commit already existed in another branch; no separate mail sent