[xorg-x11-drv-nvidia/f25] (2 commits) ...Merge branch 'master' into f25
Summary of changes:
3f492e5... Fix error in nvidia.conf rfbz#4388 (*)
14f0dcc... Merge branch 'master' into f25
(*) This commit already existed in another branch; no separate mail sent