commit 242f203e35ca8b69c9e68a33e1141955182d2663 Merge: 1eb3413 97e7469 Author: Leigh Scott <leigh123linux(a)googlemail.com&gt; Date: Wed Dec 26 13:48:39 2018 +0000 Merge branch 'master' into el7 nvidia-old.conf | 8 -------- sources | 2 +- xorg-x11-drv-nvidia.spec | 49 ++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 40 insertions(+), 19 deletions(-) ---