commit f69b76ae830270ec78d1ccc621f6d5e38b625001 Merge: 9e48995 3af173a Author: Leigh Scott <leigh123linux(a)googlemail.com&gt; Date: Tue Oct 30 22:50:41 2018 +0000 Merge branch 'master' into el7 .gitignore | 2 +- nvidia-xconfig.spec | 104 +++++++++++++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 73 insertions(+), 35 deletions(-) ---