[xorg-x11-drv-nvidia/f29: 22/22] Merge branch 'master' into f29
commit aa40c7d96879b944b9ffee1bcd6b9ec304f635fa
Merge: 36c5169 a32c6fa
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Nov 23 13:15:32 2019 +0000
Merge branch 'master' into f29
60-nvidia-uvm.rules | 4 +--
60-nvidia.rules | 10 ++++++-
nvidia.conf | 6 +++-
parse-readme.py | 2 +-
sources | 2 +-
xorg-x11-drv-nvidia.spec | 72 ++++++++++++++++++++++++++++++++++++------------
6 files changed, 73 insertions(+), 23 deletions(-)
---