commit f4ea261c6c57292a3a4ed8ce2c717833aaab70c8 Merge: d41b129 4838e73 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Mon May 18 12:56:59 2020 +0200 Merge branch 'master' into el7 .gitignore | 21 ++++++++-- nvidia.conf | 2 +- sources | 5 +-- xorg-x11-drv-nvidia-340xx.spec | 87 +++++++++++++++++++++++++++++++++--------- 4 files changed, 89 insertions(+), 26 deletions(-) ---