commit 2c54a45c69226aa2196b9428a79a433062c8112d Merge: 648dbdc aa42888 Author: Leigh Scott <leigh123linux(a)googlemail.com&gt; Date: Sun Oct 28 11:47:33 2018 +0000 Merge branch 'master' into f28 00-avoid-glamor.conf | 6 -- 99-nvidia.conf | 7 -- blacklist-nouveau.conf | 4 - nvidia.conf | 1 - sources | 2 +- xorg-x11-drv-nvidia.spec | 203 +++++++++++++++-------------------------------- 6 files changed, 64 insertions(+), 159 deletions(-) ---