commit 14f0dccbdb8787d5a26b35164f67eaee4a81f2dd Merge: 27c7cc2 3f492e5 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sat Dec 24 14:11:19 2016 +0000 Merge branch 'master' into f25 nvidia.conf | 10 +++++++++- xorg-x11-drv-nvidia.spec | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) ---