commit 61a8770bf3ab5fa4df9b7ba24079586b24e8dc15 Merge: 4c2f268 c9c60e0 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Mon Dec 19 10:38:51 2016 +0000 Merge branch 'master' into f25 nvidia-old.conf | 8 ++++++++ nvidia.conf | 3 +++ xorg-x11-drv-nvidia.spec | 28 ++++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 4 deletions(-) ---