commit 140acc45ab21fcb8395ac645e0a10c67a51dc8bc Merge: b34b8c6 681eb86 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Wed Mar 11 10:54:31 2020 +0100 Merge branch 'master' into el7 60-nvidia-uvm.rules | 4 +- 60-nvidia.rules | 10 +++- nvidia.conf | 6 ++- parse-readme.py | 2 +- sources | 2 +- xorg-x11-drv-nvidia.spec | 126 +++++++++++++++++++++++++++++++++-------------- 6 files changed, 107 insertions(+), 43 deletions(-) ---